Fixes for Windows x64 - LLP64.

Author: macmade

dlib/include/dlib-private-macros.h

@@ -100,8 +100,8 @@ extern "C" {
                                                                             DLib_ModuleRef mod;                                                                 \
                                                                             DLib_SymbolRef sym;                                                                 \
                                                                             void         * addr;                                                                \
-                                                                            long           laddr;                                                               \
-                                                                            long           lff;                                                                 \
+                                                                            DLib_Ptr       laddr;                                                               \
+                                                                            DLib_Ptr       lff;                                                                 \
                                                                             _ret_ ( * ff )( __VA_ARGS__ );                                                      \
                                                                                                                                                                 \
                                                                             mod   = DLib_GetModule( # _module_ );                                               \
@@ -110,9 +110,9 @@ extern "C" {
                                                                             if( sym != NULL )                                                                   \
                                                                             {                                                                                   \
                                                                                 addr  = DLib_Symbol_GetAddress( sym );                                          \
-                                                                                laddr = ( long )addr;                                                           \
+                                                                                laddr = ( DLib_Ptr )addr;                                                       \
                                                                                 ff    = ( _ret_ ( * )( __VA_ARGS__ ) )laddr;                                    \
-                                                                                lff   = ( long )ff;                                                             \
+                                                                                lff   = ( DLib_Ptr )ff;                                                         \
                                                                                                                                                                 \
                                                                                 DLIB_PRIVATE_ATOMIC_CAS_PTR( NULL, ( void * )lff, &f );                         \
                                                                             }                                                                                   \

dlib/include/dlib-types.h

@@ -47,6 +47,14 @@ typedef enum
 }
 DLib_ModuleType;
 
+#if defined( _WIN32 ) && defined( _WIN64 )
+typedef long long DLib_Ptr;     /* Windows x64 - LLP64 */
+#elif defined( _WIN32 )
+typedef int DLib_Ptr;           /* Windows x86 - ILP32 */
+#else
+typedef long DLib_Ptr;          /* OS X - LP64 or ILP32 */
+#endif
+
 #ifdef __cplusplus
 }
 #endif

dlib/source/dlib-module.c

@@ -169,9 +169,6 @@ void __DLib_Module_Load( DLib_ModuleRef module )
 
         if( ws != NULL )
         {
-            /*
-            module->handle = LoadLibraryEx( ws, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS );
-            */
             module->handle = LoadLibrary( ws );
 
             free( ws );