diff options
author | msmit <msmit@remedy.nl> | 2009-04-20 09:18:43 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2009-04-20 09:18:43 +0000 |
commit | 8d6958457626dab5e1127b466e613677d951a3a2 (patch) | |
tree | bea99b29a29fc6bfcb82cdbeef8172ab8e7f63f1 /ACE/ace/config-WinCE.h | |
parent | a049dec25603b768ecc84a901bc4cd1a52fe9e5a (diff) | |
download | ATCD-8d6958457626dab5e1127b466e613677d951a3a2.tar.gz |
Mon Apr 20 10:17:32 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ace/Basic_Types.h:
* ace/config-WinCE.h:
* ace/OS_NS_stropts.h:
* ace/OS_NS_sys_socket.h:
* ace/OS_NS_Thread.cpp:
Removed WinCE support for versions < 5.0.
* ace/config-win32-cegcc.h:
Removed temporary defines.
* ace/config-win32-common.h:
Replaced UNDER_CE with _WIN32_WCE.
* ace/OS_main.cpp:
* ace/OS_main.h:
Removed CE gcc compiler warning by
adding destructor.
* ace/OS_NS_Thread.inl:
Removed WinCE support for versions before 5.0.
Added ACE_LACKS_CE_THREAD_PRIORITY define in order
to compile on CE gcc.
* ace/Process.cpp:
Removed CE gcc compiler warning by
using ACE_UNUSED_ARG.
* ace/Registry.cpp:
* ace/Registry.h:
Removed CE gcc compiler warning by
adding destructor.
Removed CE gcc compiler warning by
using ACE_UNUSED_ARG.
* ace/SV_Semaphore_Simple.cpp:
Removed pragma's for CE gcc compiler. Removed
check on ACE_WIN64 define.
* include/makeinclude/platform_cegcc.GNU:
Default platform macros for CE gcc compiler.
* include/makeinclude/platform_gnuwin32_common.GNU:
Added support for CE gcc compiler.
Diffstat (limited to 'ACE/ace/config-WinCE.h')
-rw-r--r-- | ACE/ace/config-WinCE.h | 72 |
1 files changed, 18 insertions, 54 deletions
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index 9fa49a63018..40a755348fc 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -15,26 +15,13 @@ # error Use config-win32.h in config.h instead of this header #endif // ACE_CONFIG_WIN32_H -#if !defined (UNDER_CE) -# error Define UNDER_CE to version (i.e. 300 = 3.0) -#endif // UNDER_CE - -#if (UNDER_CE < 300) -# error ACE requires Windows CE 3.0 and later. -#endif // UNDER_CE - -#if (UNDER_CE < 400) -// CE 3 doesn't have Winsock 2, but CE 4 does. -# if !defined (ACE_HAS_WINSOCK2) -# define ACE_HAS_WINSOCK2 0 -# endif -# define ACE_LACKS_ASSERT_H -# define ACE_LACKS_SEARCH_H -# define ACE_LACKS_WCHAR_H -# define ACE_LACKS_WCTYPE_H -# define ACE_LACKS_STDDEF_H -# define ACE_LACKS_PTRDIFF_T -#endif /* UNDER_CE < 400 */ +#if !defined (_WIN32_WCE) +# error Define _WIN32_WCE to version (i.e. 500 = 5.0) +#endif // _WIN32_WCE + +#if (_WIN32_WCE < 500) +# error ACE requires Windows CE 5.0 and later. +#endif // _WIN32_WCE #if !defined (ACE_HAS_WINCE) # define ACE_HAS_WINCE 1 @@ -50,8 +37,10 @@ #endif // We need these libraries to build: -#pragma comment(lib,"corelibc.lib") -#pragma comment(linker, "/nodefaultlib:oldnames.lib") +#if defined (_MSC_VER) +# pragma comment(lib,"corelibc.lib") +# pragma comment(linker, "/nodefaultlib:oldnames.lib") +#endif // Only DLL version is supported on CE. //#if defined (ACE_HAS_DLL) @@ -104,7 +93,7 @@ # define ACE_LACKS_ERRNO_H # define ACE_LACKS_DUP # define ACE_LACKS_GETSYSTEMTIMEASFILETIME -#endif +#endif /* (_WIN32_WCE < 0x600) */ #define ACE_LACKS_REGNOTIFYCHANGEKEYVALUE @@ -153,23 +142,9 @@ #define _O_TEXT 0x4000 // file mode is text (translated) #define _O_BINARY 0x8000 // file mode is binary (untranslated) -// macro to translate the C 2.0 name used to force binary mode for files -//#define _O_RAW _O_BINARY - -// Open handle inherit bit -//#define _O_NOINHERIT 0x0080 // child process doesn't inherit file - // Temporary file bit - file is deleted when last handle is closed #define _O_TEMPORARY 0x0040 // temporary file bit -// temporary access hint -//#define _O_SHORT_LIVED 0x1000 // temporary storage file, try not to flush - -// sequential/random access hints -//#define _O_SEQUENTIAL 0x0020 // file access is primarily sequential -//#define _O_RANDOM 0x0010 // file access is primarily random - - // Non-ANSI names #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY @@ -181,11 +156,6 @@ #define O_TEXT _O_TEXT #define O_BINARY _O_BINARY #define O_TEMPORARY _O_TEMPORARY -//#define O_RAW _O_BINARY -//#define O_NOINHERIT _O_NOINHERIT -//#define O_SEQUENTIAL _O_SEQUENTIAL -//#define O_RANDOM _O_RANDOM - // @@ NSIG value. This is definitely not correct. #define NSIG 23 @@ -194,16 +164,10 @@ // Need to find out what it is. (Used in MapViewOfFile ().) #define FILE_MAP_COPY 0 -#if (_WIN32_WCE >= 0x400) -# define ACE_HAS_INTERLOCKED_EXCHANGEADD -#endif - +#define ACE_HAS_INTERLOCKED_EXCHANGEADD #define ACE_LACKS_ACCESS #define ACE_LACKS__WACCESS #define ACE_HAS_ACCESS_EMULATION -#if (_WIN32_WCE < 0x500) -# define ACE_LACKS_FILELOCKS -#endif #define ACE_LACKS_EXEC #define ACE_LACKS_MKTEMP #define ACE_LACKS_ISATTY @@ -229,7 +193,7 @@ #endif // _WIN32_WCE_EMULATION #if !defined (BUFSIZ) -# define BUFSIZ 1024 +# define BUFSIZ 1024 #endif #define ACE_LACKS_MALLOC_H // We do have malloc.h, but don't use it. @@ -239,22 +203,22 @@ #define ACE_HAS_STRDUP_EMULATION #if !defined (MAXSYMLINKS) -#define MAXSYMLINKS 0 +# define MAXSYMLINKS 0 #endif // WinCE can't do fixed addresses for memory-mapped files. #if defined (ACE_DEFAULT_BASE_ADDR) -# undef ACE_DEFAULT_BASE_ADDR +# undef ACE_DEFAULT_BASE_ADDR #endif #define ACE_DEFAULT_BASE_ADDR 0 #if (_WIN32_WCE < 0x600) -#define ACE_HAS_TSS_EMULATION +# define ACE_HAS_TSS_EMULATION #endif // WinCE version < 6.0 // CE doesn't support FILE_SHARE_DELETE like regular windows #if !defined (ACE_DEFAULT_FILE_PERMS) -#define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) +# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) #endif #define ACE_LACKS_SIGNAL_H |