diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:28:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:28:27 +0000 |
| commit | acb382e25e38b41cedced953e14acd3609ffd105 (patch) | |
| tree | d3fd0473b9c12d7f3982b3d82565ba8deca63e58 /dmake | |
| parent | 3572004480dedda4c1d753f054a998c654250720 (diff) | |
INTEGRATION: CWS dmake412_DEV300 (1.12.2); FILE MERGED
2007/11/12 00:12:02 vq 1.12.2.3: #i83540# Make dmake buildable with .NET 2003 again.
2007/11/11 23:05:48 vq 1.12.2.2: #i83540# Enable parallel builds with native W32 dmake. (First MinGW only.)
2007/11/11 00:03:31 vq 1.12.2.1: #i83523# Rename macro PVOID to DMPVOID to avoid problems when including
windows.h.
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/extern.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/dmake/extern.h b/dmake/extern.h index 5937458d4092..4149fe7b14b8 100644 --- a/dmake/extern.h +++ b/dmake/extern.h @@ -1,6 +1,6 @@ /* $RCSfile: extern.h,v $ --- $Revision: 1.12 $ --- last change: $Author: ihi $ $Date: 2007-10-15 15:39:00 $ +-- $Revision: 1.13 $ +-- last change: $Author: kz $ $Date: 2008-03-05 18:28:27 $ -- -- SYNOPSIS -- External declarations for dmake functions. @@ -29,6 +29,12 @@ #ifndef EXTERN_h #define EXTERN_h +/* For MSVC++ needs to include windows.h first to avoid problems with + * type redefinitions. Include it also for MinGW for consistency. */ +#if defined(__MINGW32__) || defined(_MSC_VER) +#include <windows.h> +#endif + #include "config.h" /* Define this for the RS/6000 if it breaks something then we have to put a @@ -74,7 +80,7 @@ # include <utime.h> #endif -#define PVOID void * +#define DMPVOID void * #include <signal.h> #include "itypes.h" @@ -139,6 +145,19 @@ char *cygdospath(char *src, int winpath); # define NULLDEV "/dev/null" #endif +/* For MSVC 6.0 and newer and MinGW use the CreateProcess() function. */ +#if defined(__MINGW32__) || defined(_MSC_VER) && _MSC_VER >= 1200 +# define USE_CREATEPROCESS 1 +#else +/* #undef USE_CREATEPROCESS */ +#endif + +/* CreateProcess() is spawn-like. */ +#if ENABLE_SPAWN && ( HAVE_SPAWN_H || __CYGWIN__ || __EMX__) || defined(USE_CREATEPROCESS) +# define USE_SPAWN 1 +#else +/* #undef USE_SPAWN */ +#endif /* Work around some of the functions that may or may not exist */ #if ! HAVE_TZSET |