projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed element animation when collecting for BD engine
[rocksndiamonds.git]
/
src
/
libgame
/
windows.h
diff --git
a/src/libgame/windows.h
b/src/libgame/windows.h
index 30273488a8892c29fb70ecee41acb1af9124ebb5..57787826cc837a90bd76520f7599e2044ea83fbb 100644
(file)
--- a/
src/libgame/windows.h
+++ b/
src/libgame/windows.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// windows.h
// ============================================================================
// ----------------------------------------------------------------------------
// windows.h
// ============================================================================
@@
-12,10
+12,16
@@
#ifndef WINDOWS_H
#define WINDOWS_H
#ifndef WINDOWS_H
#define WINDOWS_H
+// prevent including lots of conflicting macros
+#define WIN32_LEAN_AND_MEAN
+
#include <shlobj.h>
#include <shlobj.h>
-/* some symbols are already defined on Windows */
+// some symbols are already defined on Windows
+typedef int boolean_internal;
+#define boolean boolean_internal
+
#define CreateBitmap CreateBitmap_internal
#define GetPixel GetPixel_internal
#define CloseWindow CloseWindow_internal
#define CreateBitmap CreateBitmap_internal
#define GetPixel GetPixel_internal
#define CloseWindow CloseWindow_internal
@@
-36,4
+42,4
@@
#define DrawText DrawText_internal
#endif
#define DrawText DrawText_internal
#endif
-#endif /
* WINDOWS_H */
+#endif /
/ WINDOWS_H