summaryrefslogtreecommitdiff
path: root/dmake/extern.h
diff options
context:
space:
mode:
authorKen Foskey <waratah@openoffice.org>2002-10-04 12:31:37 +0000
committerKen Foskey <waratah@openoffice.org>2002-10-04 12:31:37 +0000
commitc52e65d4c790b252c7c03dcc34312e47dc95fcda (patch)
tree547257810159a2791753d8d99ce5b87fc53dbd9b /dmake/extern.h
parenta89a994d774f348527f5dc2d68ebbeb870bf3e4a (diff)
Dmake: Convert the configure to a better configure process without individual conf.h files for every platform
Diffstat (limited to 'dmake/extern.h')
-rw-r--r--dmake/extern.h40
1 files changed, 32 insertions, 8 deletions
diff --git a/dmake/extern.h b/dmake/extern.h
index 07060e65d5d2..0b0a535ada64 100644
--- a/dmake/extern.h
+++ b/dmake/extern.h
@@ -1,4 +1,4 @@
-/* RCS $Id: extern.h,v 1.3 2002-07-11 08:53:29 mh Exp $
+/* RCS $Id: extern.h,v 1.4 2002-10-04 13:31:34 waratah Exp $
--
-- SYNOPSIS
-- External declarations for dmake functions.
@@ -27,25 +27,50 @@
#ifndef EXTERN_h
#define EXTERN_h
+#include "config.h"
+
/* Define this for the RS/6000 if it breaks something then we have to put a
* #ifdef around it. */
#if defined(rs6000)
#define _POSIX_SOURCE
#endif
-#include <limits.h>
#include <stdio.h>
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <string.h>
#include <ctype.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#if defined (_MPW)
-# include <types.h>
-# include <time.h>
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+#if HAVE_SYS_TYPES_H
# include <sys/types.h>
+#else
+# include <types.h>
+#endif
+#if HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
+
+#define PVOID void *
+
#include <signal.h>
#include "itypes.h"
#include "stdmacs.h"
@@ -60,7 +85,6 @@
/* Include this last as it invalidates some functions that are defined
* externally above and turns them into no-ops. Have to do this after
* the extern declarations however. */
-#include "conf.h"
#include "posix.h"
#endif