← Back to branch summary

~flosoft/s25rttr/trunk

« back to all changes in this revision

Viewing changes to src/glArchivItem_Bitmap_Raw.cpp

  • Committer: FloSoft
  • Date: 2014-04-25 15:35:50 UTC
  • Revision ID: flosoft@siedler25.org-20140425153550-9muu4vodhlqu58m0
committing subversion revision 9357 by FloSoft
astyle

modified:
s25client/trunk/
s25client/trunk/contrib/lua/lin32/include/
s25client/trunk/contrib/lua/lin64/include/
s25client/trunk/contrib/lua/mac/include/
s25client/trunk/contrib/lua/win32/include/
s25client/trunk/contrib/lua/win64/include/
s25client/trunk/driver/audio/SDL/src/
s25client/trunk/driver/src/
s25client/trunk/driver/video/GLFW/src/
s25client/trunk/driver/video/SDL/src/
s25client/trunk/driver/video/WinAPI/src/
s25client/trunk/src/
s25client/trunk/win32/
s25client/trunk/win32/prebuild-mutex/src/

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glArchivItem_Bitmap_Raw.cpp
1
 
// $Id: glArchivItem_Bitmap_Raw.cpp 7521 2011-09-08 20:45:55Z FloSoft $
 
1
// $Id: glArchivItem_Bitmap_Raw.cpp 9357 2014-04-25 15:35:25Z FloSoft $
2
2
//
3
3
// Copyright (c) 2005 - 2011 Settlers Freaks (sf-team at siedler25.org)
4
4
//
25
25
///////////////////////////////////////////////////////////////////////////////
26
26
// Makros / Defines
27
27
#if defined _WIN32 && defined _DEBUG && defined _MSC_VER
28
 
        #define new new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
29
 
        #undef THIS_FILE
30
 
        static char THIS_FILE[] = __FILE__;
 
28
#define new new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
 
29
#undef THIS_FILE
 
30
static char THIS_FILE[] = __FILE__;
31
31
#endif