[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15556] trunk/blender/intern/ghost/intern: Fix to let Ghost compile with win64 msvc compiler.
Daniel Genrich
daniel.genrich at gmx.net
Sun Jul 13 19:49:17 CEST 2008
Revision: 15556
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15556
Author: genscher
Date: 2008-07-13 19:49:12 +0200 (Sun, 13 Jul 2008)
Log Message:
-----------
Fix to let Ghost compile with win64 msvc compiler.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-13 17:17:57 UTC (rev 15555)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-13 17:49:12 UTC (rev 15556)
@@ -42,6 +42,14 @@
#include "GHOST_SystemWin32.h"
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
/*
* According to the docs the mouse wheel message is supported from windows 98
* upwards. Leaving WINVER at default value, the WM_MOUSEWHEEL message and the
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-13 17:17:57 UTC (rev 15555)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-13 17:49:12 UTC (rev 15556)
@@ -48,6 +48,14 @@
#define M_PI 3.1415926536
#endif
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
LPCSTR GHOST_WindowWin32::s_windowClassName = "GHOST_WindowClass";
const int GHOST_WindowWin32::s_maxTitleLength = 128;
HGLRC GHOST_WindowWin32::s_firsthGLRc = NULL;
More information about the Bf-blender-cvs
mailing list