diff options
| author | Steve Huston <shuston@riverace.com> | 2003-01-14 19:58:19 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-01-14 19:58:19 +0000 |
| commit | 44ebf665f0da4065795d7a995179054b6ecc44d7 (patch) | |
| tree | 9043b016b8eeb491071d73e684855c81131c5e88 | |
| parent | bb03a16bdf96455903aa6a2088e0ffd269306872 (diff) | |
| download | ATCD-44ebf665f0da4065795d7a995179054b6ecc44d7.tar.gz | |
ChangeLogTag:Tue Jan 14 14:56:12 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 | ||||
| -rw-r--r-- | ace/config-WinCE.h | 4 | ||||
| -rw-r--r-- | ace/config-win32-common.h | 8 |
4 files changed, 31 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 2fe23379bfa..0fbacc8eeae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,18 @@ +Tue Jan 14 14:56:12 2003 Steve Huston <shuston@riverace.com> + + * ace/config-win32-common.h: For WinCE, don't include wce.h unless + building with MFC. wce.h is an MFC file. + + * ace/config-WinCE.h: Add pragmas to link _with_ corelibc.lib and + _without_ oldnames.lib. These weren't needed with WinCE 3/PocketPC + (but they don't hurt) and are needed for WinCE .NET. The ATL headers + do these pragmas, but we don't want to add a dependency on ATL. + Tue Jan 14 11:07:06 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * bin/generate_export_file.pl: Added a patch from Gonzalo Diethelm <gonzalo.diethelm@aditiva.com> which generates - an empty $Id$. + an empty CVS Id string. Mon Jan 13 12:53:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2fe23379bfa..0fbacc8eeae 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,8 +1,18 @@ +Tue Jan 14 14:56:12 2003 Steve Huston <shuston@riverace.com> + + * ace/config-win32-common.h: For WinCE, don't include wce.h unless + building with MFC. wce.h is an MFC file. + + * ace/config-WinCE.h: Add pragmas to link _with_ corelibc.lib and + _without_ oldnames.lib. These weren't needed with WinCE 3/PocketPC + (but they don't hurt) and are needed for WinCE .NET. The ATL headers + do these pragmas, but we don't want to add a dependency on ATL. + Tue Jan 14 11:07:06 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * bin/generate_export_file.pl: Added a patch from Gonzalo Diethelm <gonzalo.diethelm@aditiva.com> which generates - an empty $Id$. + an empty CVS Id string. Mon Jan 13 12:53:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index 8475ed4e2a5..0319898c3c5 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -27,6 +27,10 @@ # define ACE_HAS_WINCE 1 #endif +// We need these libraries to build: +#pragma comment(lib,"corelibc.lib") +#pragma comment(linker, "/nodefaultlib:oldnames.lib") + // Unicode is the OS standard string type for WinCE. #ifdef ACE_HAS_UNICODE # undef ACE_HAS_UNICODE diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 6c18446126a..78fe852c7b3 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -390,12 +390,14 @@ typedef unsigned long long ACE_UINT64; // This is necessary since MFC users apparently can't #include // <windows.h> directly. #if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) -# include /**/ <afxwin.h> /* He is doing MFC */ +# include /**/ <afxwin.h> /* He is doing MFC */ // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h // #define _INC_WINDOWS // Prevent winsock.h from including windows.h +# if defined (ACE_HAS_WINCE) +# include /**/ <wce.h> +# endif /* ACE_HAS_WINCE */ #elif defined (ACE_HAS_WINCE) -# include /**/ <windows.h> -# include /**/ <wce.h> +# include /**/ <windows.h> #endif #if !defined (_INC_WINDOWS) /* Already include windows.h ? */ |