diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-09-28 00:34:56 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-09-28 00:34:56 +0000 |
| commit | 8764615692862f8f8c8c3daafc430e94c7edc43e (patch) | |
| tree | e7a05db32ee9b7cdac09bf281bfdb2620e4328a3 /ace/config-win32.h | |
| parent | de89e333123b2afee5fb948f8a99fa100967cffb (diff) | |
| download | ATCD-8764615692862f8f8c8c3daafc430e94c7edc43e.tar.gz | |
ChangeLogTag:Thu Sep 27 06:12:21 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
Diffstat (limited to 'ace/config-win32.h')
| -rw-r--r-- | ace/config-win32.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ace/config-win32.h b/ace/config-win32.h index 410d788d9bd..37150b77302 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -32,7 +32,13 @@ # include "ace/config-WinCE.h" #endif /* _WIN32_WCE */ -#include "ace/config-win32-common.h" +// We need to ensure that for Borland vcl.h can be included before +// windows.h. So we will not include config-win32-common.h from here, +// but instead let it be included at the appropriate place in +// config-win32-borland.h. +#if !defined (__BORLANDC__) +# include "ace/config-win32-common.h" +#endif /* !__BORLANDC__ */ // Include the config-win32-* file specific to the compiler |