diff --git a/include/boost/detail/win/GetCurrentProcess.hpp b/include/boost/detail/winapi/GetCurrentProcess.hpp similarity index 62% rename from include/boost/detail/win/GetCurrentProcess.hpp rename to include/boost/detail/winapi/GetCurrentProcess.hpp index a76eb06..51206bb 100644 --- a/include/boost/detail/win/GetCurrentProcess.hpp +++ b/include/boost/detail/winapi/GetCurrentProcess.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_GETCURRENTPROCESS_HPP -#define BOOST_DETAIL_WIN_GETCURRENTPROCESS_HPP +#ifndef BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP +#define BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::GetCurrentProcess; #else @@ -22,4 +26,4 @@ namespace win32 { } } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP diff --git a/include/boost/detail/win/GetCurrentThread.hpp b/include/boost/detail/winapi/GetCurrentThread.hpp similarity index 70% rename from include/boost/detail/win/GetCurrentThread.hpp rename to include/boost/detail/winapi/GetCurrentThread.hpp index cdc6d36..595b751 100644 --- a/include/boost/detail/win/GetCurrentThread.hpp +++ b/include/boost/detail/winapi/GetCurrentThread.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_GETCURRENTTHREAD_HPP -#define BOOST_DETAIL_WIN_GETCURRENTTHREAD_HPP +#ifndef BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP +#define BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( UNDER_CE ) // Windows CE define GetCurrentThread as an inline function in kfuncs.h inline HANDLE_ GetCurrentThread() @@ -31,4 +35,4 @@ inline HANDLE_ GetCurrentThread() } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP diff --git a/include/boost/detail/win/GetLastError.hpp b/include/boost/detail/winapi/GetLastError.hpp similarity index 63% rename from include/boost/detail/win/GetLastError.hpp rename to include/boost/detail/winapi/GetLastError.hpp index d040abf..6e9e2d9 100644 --- a/include/boost/detail/win/GetLastError.hpp +++ b/include/boost/detail/winapi/GetLastError.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_GETLASTERROR_HPP -#define BOOST_DETAIL_WIN_GETLASTERROR_HPP +#ifndef BOOST_DETAIL_WINAPI_GETLASTERROR_HPP +#define BOOST_DETAIL_WINAPI_GETLASTERROR_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::GetLastError; #else @@ -24,4 +28,4 @@ namespace win32 { } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_GETLASTERROR_HPP diff --git a/include/boost/detail/win/GetProcessTimes.hpp b/include/boost/detail/winapi/GetProcessTimes.hpp similarity index 73% rename from include/boost/detail/win/GetProcessTimes.hpp rename to include/boost/detail/winapi/GetProcessTimes.hpp index 8d76995..f2860b0 100644 --- a/include/boost/detail/win/GetProcessTimes.hpp +++ b/include/boost/detail/winapi/GetProcessTimes.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP -#define BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP +#ifndef BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP +#define BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if !defined(UNDER_CE) // Windows CE does not define GetProcessTimes #if defined( BOOST_USE_WINDOWS_H ) using ::GetProcessTimes; @@ -32,4 +36,4 @@ namespace win32 { } } -#endif // BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP +#endif // BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP diff --git a/include/boost/detail/win/GetThreadTimes.hpp b/include/boost/detail/winapi/GetThreadTimes.hpp similarity index 71% rename from include/boost/detail/win/GetThreadTimes.hpp rename to include/boost/detail/winapi/GetThreadTimes.hpp index cf19c46..3428eda 100644 --- a/include/boost/detail/win/GetThreadTimes.hpp +++ b/include/boost/detail/winapi/GetThreadTimes.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_GETTHREADTIMES_HPP -#define BOOST_DETAIL_WIN_GETTHREADTIMES_HPP +#ifndef BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP +#define BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::GetThreadTimes; #else @@ -30,4 +34,4 @@ namespace win32 { } } -#endif // BOOST_DETAIL_WIN_GETTHREADTIMES_HPP +#endif // BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP diff --git a/include/boost/detail/win/LocalFree.hpp b/include/boost/detail/winapi/LocalFree.hpp similarity index 67% rename from include/boost/detail/win/LocalFree.hpp rename to include/boost/detail/winapi/LocalFree.hpp index da1c77b..697016c 100644 --- a/include/boost/detail/win/LocalFree.hpp +++ b/include/boost/detail/winapi/LocalFree.hpp @@ -6,14 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_LOCALFREE_HPP -#define BOOST_DETAIL_WIN_LOCALFREE_HPP +#ifndef BOOST_DETAIL_WINAPI_LOCALFREE_HPP +#define BOOST_DETAIL_WINAPI_LOCALFREE_HPP -#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef HANDLE_ HLOCAL_; @@ -26,4 +30,4 @@ namespace win32 { } } } -#endif // BOOST_DETAIL_WIN_LOCALFREE_HPP +#endif // BOOST_DETAIL_WINAPI_LOCALFREE_HPP diff --git a/include/boost/detail/win/basic_types.hpp b/include/boost/detail/winapi/basic_types.hpp similarity index 92% rename from include/boost/detail/win/basic_types.hpp rename to include/boost/detail/winapi/basic_types.hpp index 79f6787..e9ca370 100644 --- a/include/boost/detail/win/basic_types.hpp +++ b/include/boost/detail/winapi/basic_types.hpp @@ -6,11 +6,13 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_BASIC_TYPES_HPP -#define BOOST_DETAIL_WIN_BASIC_TYPES_HPP +#ifndef BOOST_DETAIL_WINAPI_BASIC_TYPES_HPP +#define BOOST_DETAIL_WINAPI_BASIC_TYPES_HPP + #include #include #include + #if defined( BOOST_USE_WINDOWS_H ) # include #elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) @@ -33,9 +35,13 @@ # error "Win32 functions not available" #endif +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif + namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef ::BOOL BOOL_; typedef ::WORD WORD_; @@ -102,10 +108,9 @@ extern "C" { typedef wchar_t WCHAR_; typedef WCHAR_ *LPWSTR_; typedef const WCHAR_ *LPCWSTR_; - } #endif } } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_TIME_HPP diff --git a/include/boost/detail/win/directory_management.hpp b/include/boost/detail/winapi/directory_management.hpp similarity index 74% rename from include/boost/detail/win/directory_management.hpp rename to include/boost/detail/winapi/directory_management.hpp index 1ffe659..19af1ee 100644 --- a/include/boost/detail/win/directory_management.hpp +++ b/include/boost/detail/winapi/directory_management.hpp @@ -6,17 +6,21 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_DIRECTORY_MANAGEMENT_HPP -#define BOOST_DETAIL_WIN_DIRECTORY_MANAGEMENT_HPP +#ifndef BOOST_DETAIL_WINAPI_DIRECTORY_MANAGEMENT_HPP +#define BOOST_DETAIL_WINAPI_DIRECTORY_MANAGEMENT_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::CreateDirectory; @@ -33,11 +37,10 @@ extern "C" { GetTempPathA(unsigned long length, char *buffer); __declspec(dllimport) int __stdcall RemoveDirectoryA(LPCTSTR_); - } #endif } } } -#endif // BOOST_DETAIL_WIN_THREAD_HPP +#endif // BOOST_DETAIL_WINAPI_THREAD_HPP diff --git a/include/boost/detail/win/dll.hpp b/include/boost/detail/winapi/dll.hpp similarity index 77% rename from include/boost/detail/win/dll.hpp rename to include/boost/detail/winapi/dll.hpp index 605a1bf..ed45272 100644 --- a/include/boost/detail/win/dll.hpp +++ b/include/boost/detail/winapi/dll.hpp @@ -6,17 +6,21 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_DLL_HPP -#define BOOST_DETAIL_WIN_DLL_HPP +#ifndef BOOST_DETAIL_WINAPI_DLL_HPP +#define BOOST_DETAIL_WINAPI_DLL_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::LoadLibrary; @@ -42,11 +46,10 @@ extern "C" { GetModuleHandleA( LPCSTR_ lpProcName ); - } #endif } } } -#endif // BOOST_DETAIL_WIN_THREAD_HPP +#endif // BOOST_DETAIL_WINAPI_THREAD_HPP diff --git a/include/boost/detail/win/error_handling.hpp b/include/boost/detail/winapi/error_handling.hpp similarity index 89% rename from include/boost/detail/win/error_handling.hpp rename to include/boost/detail/winapi/error_handling.hpp index d6fb428..fbe9924 100644 --- a/include/boost/detail/win/error_handling.hpp +++ b/include/boost/detail/winapi/error_handling.hpp @@ -6,15 +6,20 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_ERROR_HANDLING_HPP -#define BOOST_DETAIL_WIN_ERROR_HANDLING_HPP +#ifndef BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP +#define BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { + #if defined( BOOST_USE_WINDOWS_H ) using ::FormatMessageA; using ::FormatMessageW; @@ -85,4 +90,4 @@ extern "C" { } } } -#endif // BOOST_DETAIL_WIN_ERROR_HANDLING_HPP +#endif // BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP diff --git a/include/boost/detail/win/file_management.hpp b/include/boost/detail/winapi/file_management.hpp similarity index 92% rename from include/boost/detail/win/file_management.hpp rename to include/boost/detail/winapi/file_management.hpp index 5cb0dbf..c1d5978 100644 --- a/include/boost/detail/win/file_management.hpp +++ b/include/boost/detail/winapi/file_management.hpp @@ -6,17 +6,21 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_FILE_MANAGEMENT_HPP -#define BOOST_DETAIL_WIN_FILE_MANAGEMENT_HPP +#ifndef BOOST_DETAIL_WINAPI_FILE_MANAGEMENT_HPP +#define BOOST_DETAIL_WINAPI_FILE_MANAGEMENT_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::CreateFileA; @@ -123,4 +127,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_THREAD_HPP +#endif // BOOST_DETAIL_WINAPI_THREAD_HPP diff --git a/include/boost/detail/win/handles.hpp b/include/boost/detail/winapi/handles.hpp similarity index 71% rename from include/boost/detail/win/handles.hpp rename to include/boost/detail/winapi/handles.hpp index 1441d10..d4cffc8 100644 --- a/include/boost/detail/win/handles.hpp +++ b/include/boost/detail/winapi/handles.hpp @@ -6,17 +6,20 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_HANDLES_HPP -#define BOOST_DETAIL_WIN_HANDLES_HPP +#ifndef BOOST_DETAIL_WINAPI_HANDLES_HPP +#define BOOST_DETAIL_WINAPI_HANDLES_HPP -#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::CloseHandle; @@ -34,4 +37,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_HANDLES_HPP +#endif // BOOST_DETAIL_WINAPI_HANDLES_HPP diff --git a/include/boost/detail/win/memory.hpp b/include/boost/detail/winapi/memory.hpp similarity index 80% rename from include/boost/detail/win/memory.hpp rename to include/boost/detail/winapi/memory.hpp index 8bf59ad..b5316e0 100644 --- a/include/boost/detail/win/memory.hpp +++ b/include/boost/detail/winapi/memory.hpp @@ -6,19 +6,22 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_MEMORY_HPP -#define BOOST_DETAIL_WIN_MEMORY_HPP +#ifndef BOOST_DETAIL_WINAPI_MEMORY_HPP +#define BOOST_DETAIL_WINAPI_MEMORY_HPP -#include -#include -#include +#include +#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::CreateFileMappingA; @@ -30,9 +33,7 @@ namespace win32 using ::OpenFileMappingA; using ::UnmapViewOfFile; #else -# ifdef HeapAlloc -# undef HeapAlloc -# endif +#undef HeapAlloc extern "C" { __declspec(dllimport) void * __stdcall CreateFileMappingA (void *, SECURITY_ATTRIBUTES_*, unsigned long, unsigned long, unsigned long, const char *); @@ -56,4 +57,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP +#endif // BOOST_DETAIL_WINAPI_MEMORY_HPP diff --git a/include/boost/detail/win/process.hpp b/include/boost/detail/winapi/process.hpp similarity index 64% rename from include/boost/detail/win/process.hpp rename to include/boost/detail/winapi/process.hpp index 10c3a93..411ffaf 100644 --- a/include/boost/detail/win/process.hpp +++ b/include/boost/detail/winapi/process.hpp @@ -6,15 +6,19 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_PROCESS_HPP -#define BOOST_DETAIL_WIN_PROCESS_HPP +#ifndef BOOST_DETAIL_WINAPI_PROCESS_HPP +#define BOOST_DETAIL_WINAPI_PROCESS_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::GetCurrentProcessId; #else @@ -30,4 +34,4 @@ extern "C" { } } } -#endif // BOOST_DETAIL_WIN_PROCESS_HPP +#endif // BOOST_DETAIL_WINAPI_PROCESS_HPP diff --git a/include/boost/detail/win/security.hpp b/include/boost/detail/winapi/security.hpp similarity index 85% rename from include/boost/detail/win/security.hpp rename to include/boost/detail/winapi/security.hpp index ee38985..79925c6 100644 --- a/include/boost/detail/win/security.hpp +++ b/include/boost/detail/winapi/security.hpp @@ -6,17 +6,20 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_SECURITY_HPP -#define BOOST_DETAIL_WIN_SECURITY_HPP +#ifndef BOOST_DETAIL_WINAPI_SECURITY_HPP +#define BOOST_DETAIL_WINAPI_SECURITY_HPP -#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef ::SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES_; @@ -59,4 +62,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_SECURITY_HPP +#endif // BOOST_DETAIL_WINAPI_SECURITY_HPP diff --git a/include/boost/detail/win/synchronization.hpp b/include/boost/detail/winapi/synchronization.hpp similarity index 78% rename from include/boost/detail/win/synchronization.hpp rename to include/boost/detail/winapi/synchronization.hpp index 391e0ef..5d3327a 100644 --- a/include/boost/detail/win/synchronization.hpp +++ b/include/boost/detail/winapi/synchronization.hpp @@ -6,17 +6,20 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP -#define BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP +#ifndef BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP +#define BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP -#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef ::CRITICAL_SECTION CRITICAL_SECTION_; @@ -47,17 +50,16 @@ namespace win32 using ::WaitForSingleObject; using ::QueueUserAPC; - enum - { - infinite = INFINITE, - wait_abandoned = WAIT_ABANDONED, - wait_object_0 = WAIT_OBJECT_0, - wait_timeout = WAIT_TIMEOUT, - wait_failed = WAIT_FAILED - }; + const DWORD_ infinite = INFINITE; + const DWORD_ wait_abandoned = WAIT_ABANDONED; + const DWORD_ wait_object_0 = WAIT_OBJECT_0; + const DWORD_ wait_timeout = WAIT_TIMEOUT; + const DWORD_ wait_failed = WAIT_FAILED; + +#else // defined( BOOST_USE_WINDOWS_H ) -#else extern "C" { + struct CRITICAL_SECTION_ { struct critical_section_debug * DebugInfo; @@ -114,9 +116,9 @@ extern "C" { unsigned long dwMilliseconds); __declspec(dllimport) int __stdcall ReleaseSemaphore(void*,long,long*); - typedef void (__stdcall *PAPCFUNC8)(ulong_ptr); + typedef void (__stdcall *PAPCFUNC8)(ULONG_PTR_); __declspec(dllimport) unsigned long __stdcall - QueueUserAPC(PAPCFUNC8,void*,ulong_ptr); + QueueUserAPC(PAPCFUNC8,void*,ULONG_PTR_); # ifndef UNDER_CE __declspec(dllimport) int __stdcall SetEvent(void*); @@ -125,21 +127,20 @@ extern "C" { # else using ::SetEvent; using ::ResetEvent; - - enum - { - infinite = (DWORD_)0xFFFFFFFF, - wait_abandoned = 0x00000080L, - wait_object_0 = 0x00000000L, - wait_timeout = 0x00000102L, - wait_failed = (DWORD_)0xFFFFFFFF - }; - # endif -} -#endif + +} // extern "C" + + const DWORD_ infinite = (DWORD_)0xFFFFFFFF; + const DWORD_ wait_abandoned = 0x00000080L; + const DWORD_ wait_object_0 = 0x00000000L; + const DWORD_ wait_timeout = 0x00000102L; + const DWORD_ wait_failed = (DWORD_)0xFFFFFFFF; + +#endif // defined( BOOST_USE_WINDOWS_H ) + } } } -#endif // BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP +#endif // BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP diff --git a/include/boost/detail/win/system.hpp b/include/boost/detail/winapi/system.hpp similarity index 75% rename from include/boost/detail/win/system.hpp rename to include/boost/detail/winapi/system.hpp index 3bcffce..35b6682 100644 --- a/include/boost/detail/win/system.hpp +++ b/include/boost/detail/winapi/system.hpp @@ -6,19 +6,21 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_SYSTEM_HPP -#define BOOST_DETAIL_WIN_SYSTEM_HPP -#include -#include +#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP +#define BOOST_DETAIL_WINAPI_SYSTEM_HPP -#include -extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef ::SYSTEM_INFO SYSTEM_INFO_; + extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); #else extern "C" { typedef struct _SYSTEM_INFO { @@ -47,4 +49,4 @@ extern "C" { } } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP diff --git a/include/boost/detail/win/thread.hpp b/include/boost/detail/winapi/thread.hpp similarity index 73% rename from include/boost/detail/win/thread.hpp rename to include/boost/detail/winapi/thread.hpp index 4e1bf30..3c1be66 100644 --- a/include/boost/detail/win/thread.hpp +++ b/include/boost/detail/winapi/thread.hpp @@ -6,17 +6,21 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_THREAD_HPP -#define BOOST_DETAIL_WIN_THREAD_HPP +#ifndef BOOST_DETAIL_WINAPI_THREAD_HPP +#define BOOST_DETAIL_WINAPI_THREAD_HPP -#include -#include +#include +#include + +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::GetCurrentThreadId; @@ -42,4 +46,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_THREAD_HPP +#endif // BOOST_DETAIL_WINAPI_THREAD_HPP diff --git a/include/boost/detail/win/time.hpp b/include/boost/detail/winapi/time.hpp similarity index 89% rename from include/boost/detail/win/time.hpp rename to include/boost/detail/winapi/time.hpp index b0adfa7..b3e4c44 100644 --- a/include/boost/detail/win/time.hpp +++ b/include/boost/detail/winapi/time.hpp @@ -6,15 +6,18 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_TIME_HPP -#define BOOST_DETAIL_WIN_TIME_HPP +#ifndef BOOST_DETAIL_WINAPI_TIME_HPP +#define BOOST_DETAIL_WINAPI_TIME_HPP -#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 { +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) typedef FILETIME FILETIME_; typedef PFILETIME PFILETIME_; @@ -79,4 +82,4 @@ inline void WINAPI GetSystemTimeAsFileTime(FILETIME_* lpFileTime) } } -#endif // BOOST_DETAIL_WIN_TIME_HPP +#endif // BOOST_DETAIL_WINAPI_TIME_HPP diff --git a/include/boost/detail/win/timers.hpp b/include/boost/detail/winapi/timers.hpp similarity index 74% rename from include/boost/detail/win/timers.hpp rename to include/boost/detail/winapi/timers.hpp index 753c91f..04c6dfb 100644 --- a/include/boost/detail/win/timers.hpp +++ b/include/boost/detail/winapi/timers.hpp @@ -6,17 +6,20 @@ // See http://www.boost.org/LICENSE_1_0.txt -#ifndef BOOST_DETAIL_WIN_TIMERS_HPP -#define BOOST_DETAIL_WIN_TIMERS_HPP +#ifndef BOOST_DETAIL_WINAPI_TIMERS_HPP +#define BOOST_DETAIL_WINAPI_TIMERS_HPP -#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif namespace boost { namespace detail { -namespace win32 +namespace winapi { #if defined( BOOST_USE_WINDOWS_H ) using ::QueryPerformanceCounter; @@ -38,4 +41,4 @@ extern "C" { } } -#endif // BOOST_DETAIL_WIN_TIMERS_HPP +#endif // BOOST_DETAIL_WINAPI_TIMERS_HPP