diff DEPENDENCIES/generic/include/boost/detail/winapi/dll.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/detail/winapi/dll.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/detail/winapi/dll.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -23,33 +23,64 @@
 namespace winapi
 {
 #if defined( BOOST_USE_WINDOWS_H )
-    using ::LoadLibrary;
+    typedef ::FARPROC FARPROC_;
+    typedef ::NEARPROC NEARPROC_;
+    typedef ::PROC PROC_;
+
+# ifdef BOOST_NO_ANSI_APIS
+    using ::LoadLibraryW;
+    using ::GetModuleHandleW;
+# else
+    using ::LoadLibraryA;
+    using ::GetModuleHandleA;
+# endif
     using ::FreeLibrary;
     using ::GetProcAddress;
-    using ::GetModuleHandleA;
 #else
-extern "C" { 
-    __declspec(dllimport) HMODULE_ __stdcall 
-        LoadLibrary(
-            LPCTSTR_ lpFileName
+extern "C" {
+# ifdef _WIN64
+    typedef INT_PTR_ (WINAPI *FARPROC_)();
+    typedef INT_PTR_ (WINAPI *NEARPROC_)();
+    typedef INT_PTR_ (WINAPI *PROC_)();
+# else
+    typedef int (WINAPI *FARPROC_)();
+    typedef int (WINAPI *NEARPROC_)();
+    typedef int (WINAPI *PROC_)();
+# endif // _WIN64
+
+# ifdef BOOST_NO_ANSI_APIS
+    __declspec(dllimport) HMODULE_ WINAPI
+        LoadLibraryW(
+            LPCWSTR_ lpFileName
     );
-    __declspec(dllimport) BOOL_ __stdcall 
+    __declspec(dllimport) HMODULE_ WINAPI
+        GetModuleHandleW(
+            LPCWSTR_ lpFileName
+    );
+# else
+    __declspec(dllimport) HMODULE_ WINAPI
+        LoadLibraryA(
+            LPCSTR_ lpFileName
+    );
+    __declspec(dllimport) HMODULE_ WINAPI
+        GetModuleHandleA(
+            LPCSTR_ lpFileName
+    );
+# endif
+
+    __declspec(dllimport) BOOL_ WINAPI
         FreeLibrary(
             HMODULE_ hModule
     );
-    __declspec(dllimport) FARPROC_ __stdcall 
+    __declspec(dllimport) FARPROC_ WINAPI
         GetProcAddress(
             HMODULE_ hModule,
             LPCSTR_ lpProcName
     );
-    __declspec(dllimport) FARPROC_ __stdcall 
-        GetModuleHandleA(
-            LPCSTR_ lpProcName
-    );
-}    
+}
 #endif
 }
 }
 }
 
-#endif // BOOST_DETAIL_WINAPI_THREAD_HPP
+#endif // BOOST_DETAIL_WINAPI_DLL_HPP