Author: piumarta Date: 2012-09-15 18:29:05 -0700 (Sat, 15 Sep 2012) New Revision: 2611

Modified: trunk/platforms/win32/vm/sqWin32Intel.c Log: include correct float.h; disable conflicting definitions of OSVERSIONINFOEX, DISPLAY_DEVICE; fix asignments to non-lvalues

Modified: trunk/platforms/win32/vm/sqWin32Intel.c =================================================================== --- trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-16 01:27:19 UTC (rev 2610) +++ trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-16 01:29:05 UTC (rev 2611) @@ -24,7 +24,7 @@ #include <stdio.h> #include <string.h> #include <fcntl.h> /* _O_BINARY */ -#include <Float.h> +#include <mingw-include/float.h> /* prevent the one in lib/gcc/XYZ/include from interfering */ #include <ole2.h> #include "sq.h" #include "sqWin32Args.h" @@ -266,7 +266,7 @@ if(!hShell) hShell = LoadLibrary(TEXT("shell32.dll")); if(!hShell) return; /* should not happen */ /* On WinNT 3.* the following will just return NULL */ - (FARPROC)ShellNotifyIcon = GetProcAddress(hShell, "Shell_NotifyIconA"); + ShellNotifyIcon = GetProcAddress(hShell, "Shell_NotifyIconA"); if(!ShellNotifyIcon) return; /* ok, we don't have it */ nid.cbSize = sizeof(nid); nid.hWnd = stWindow; @@ -329,6 +329,8 @@ return NULL; }

+#if 0 + typedef struct _OSVERSIONINFOEX { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -352,6 +354,8 @@ TCHAR DeviceKey[128]; } DISPLAY_DEVICE, *PDISPLAY_DEVICE;

+#endif + typedef BOOL (CALLBACK *pfnEnumDisplayDevices)( LPCTSTR lpDevice, // device name DWORD iDevNum, // display device