Changeset 11115 for code/trunk/src/libraries/core

Timestamp:

Feb 14, 2016, 6:08:13 PM (9 years ago)

Author:

landauf

Message:

fixed code to compile in 64bit mode

Location:

code/trunk/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)

code/trunk/src/libraries/core/Core.cc

@@ -433 +433 @@
         unsigned int coreNr = limitToCPU - 1;
         // Get the current process core mask
-        DWORD procMask;
-        DWORD sysMask;
+        ULONG_PTR procMask;
+        ULONG_PTR sysMask;
 #  if _MSC_VER >= 1400 && defined (_M_X64)
         GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR)&procMask, (PDWORD_PTR)&sysMask);

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -320 +320 @@
         HWND hwnd;
         this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);
-        LONG iconID = (LONG)LoadIcon(GetModuleHandle(nullptr), MAKEINTRESOURCE(101));
-        SetClassLong(hwnd, GCL_HICON, iconID);
+        LONG_PTR iconID = (LONG_PTR)LoadIcon(GetModuleHandle(nullptr), MAKEINTRESOURCE(101));
+        SetClassLongPtr(hwnd, GCLP_HICON, iconID);
 #endif