diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-13 12:55:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-13 12:55:27 +0000 |
| commit | 91dc704cb622c982816c0b46bacc8a04cd5ff953 (patch) | |
| tree | 3d9f4cd458ade21b0b9dc92fdf119d494bb095b1 | |
| parent | 1c9d12822948229ecfcf9a28c31a4da8b5ccf8af (diff) | |
| download | ATCD-91dc704cb622c982816c0b46bacc8a04cd5ff953.tar.gz | |
ChangeLogTag: Mon Jan 13 12:50:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/config-cygwin32.h | 6 | ||||
| -rw-r--r-- | ace/config-win32-common.h | 4 |
4 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 0744fb4b5e0..a5bdf12dd29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 13 12:53:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-common.h: + The MingW compiler can handle the export/import macros. + + * ace/config-cygwin32.h: + Corrected the guards around this header file. + Sat Jan 11 09:37:24 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS_String.cpp (wcslen_emulation): Fixed a nasty formatting diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0744fb4b5e0..a5bdf12dd29 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Mon Jan 13 12:53:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-common.h: + The MingW compiler can handle the export/import macros. + + * ace/config-cygwin32.h: + Corrected the guards around this header file. + Sat Jan 11 09:37:24 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS_String.cpp (wcslen_emulation): Fixed a nasty formatting diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h index ec433dc1e17..91eefab4a53 100644 --- a/ace/config-cygwin32.h +++ b/ace/config-cygwin32.h @@ -4,8 +4,8 @@ // The following configuration file is designed to work for CygWin // platforms using GNU C++. -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H +#ifndef ACE_CONFIG_CYGWIN32_H +#define ACE_CONFIG_CYGWIN32_H #include "ace/pre.h" #include "ace/config-cygwin32-common.h" @@ -13,4 +13,4 @@ #define ACE_HAS_AUTOMATIC_INIT_FINI #include "ace/post.h" -#endif /* ACE_CONFIG_H */ +#endif /* ACE_CONFIG_CYGWIN32_H */ diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 82939e09523..6c18446126a 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -85,7 +85,7 @@ // #endif // Define the special export macros needed to export symbols outside a dll -#if !defined (__MINGW32__) && !defined(__BORLANDC__) +#ifndef __BORLANDC__ #define ACE_HAS_CUSTOM_EXPORT_MACROS #define ACE_Proper_Export_Flag __declspec (dllexport) #define ACE_Proper_Import_Flag __declspec (dllimport) @@ -93,7 +93,7 @@ #define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>; #define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE <CLASS, LOCK>; -#endif /* !__MINGW32__ */ +#endif /* !__BORLANDC__ */ // Define ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not* // want to compile with WinSock 2.0. |