diff --git a/build/rmkdepend/imakemdep.h b/build/rmkdepend/imakemdep.h
index 3ecd5258565619dfd1fe5f9663ba9d47f0214bab..8340ce8e60b782fcce218849ac74c28521bf1583 100644
--- a/build/rmkdepend/imakemdep.h
+++ b/build/rmkdepend/imakemdep.h
@@ -184,26 +184,26 @@ in this Software without prior written authorization from the X Consortium.
#else /* not CCIMAKE */
#ifndef MAKEDEPEND
/*
-* Step 2: dup2
-* If your OS doesn't have a dup2() system call to duplicate one file
-* descriptor onto another, define such a mechanism here (if you don't
-* already fall under the existing category(ies).
-*/
+ * Step 2: dup2
+ * If your OS doesn't have a dup2() system call to duplicate one file
+ * descriptor onto another, define such a mechanism here (if you don't
+ * already fall under the existing category(ies).
+ */
#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco)
-#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \
- fcntl(fd1, F_DUPFD, fd2)))
+#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \
+ fcntl(fd1, F_DUPFD, fd2)))
#endif
/*
-* Step 3: FIXUP_CPP_WHITESPACE
-* If your cpp collapses tabs macro expansions into a single space and
-* replaces escaped newlines with a space, define this symbol. This will
-* cause imake to attempt to patch up the generated Makefile by looking
-* for lines that have colons in them (this is why the rules file escapes
-* all colons). One way to tell if you need this is to see whether or not
-* your Makefiles have no tabs in them and lots of @@ strings.
-*/
+ * Step 3: FIXUP_CPP_WHITESPACE
+ * If your cpp collapses tabs macro expansions into a single space and
+ * replaces escaped newlines with a space, define this symbol. This will
+ * cause imake to attempt to patch up the generated Makefile by looking
+ * for lines that have colons in them (this is why the rules file escapes
+ * all colons). One way to tell if you need this is to see whether or not
+ * your Makefiles have no tabs in them and lots of @@ strings.
+ */
#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE))
#define FIXUP_CPP_WHITESPACE
#endif
@@ -217,11 +217,11 @@ in this Software without prior written authorization from the X Consortium.
#endif
/*
-* Step 4: USE_CC_E, DEFAULT_CC, DEFAULT_CPP
-* If you want to use cc -E instead of cpp, define USE_CC_E.
-* If use cc -E but want a different compiler, define DEFAULT_CC.
-* If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
-*/
+ * Step 4: USE_CC_E, DEFAULT_CC, DEFAULT_CPP
+ * If you want to use cc -E instead of cpp, define USE_CC_E.
+ * If use cc -E but want a different compiler, define DEFAULT_CC.
+ * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
+ */
#ifdef hpux
#define USE_CC_E
#endif
@@ -271,331 +271,331 @@ in this Software without prior written authorization from the X Consortium.
#endif
/*
-* Step 5: cpp_argv
-* The following table contains the flags that should be passed
-* whenever a Makefile is being generated. If your preprocessor
-* doesn't predefine any unique symbols, choose one and add it to the
-* end of this table. Then, do the following:
-*
-* a. Use this symbol in Imake.tmpl when setting MacroFile.
-* b. Put this symbol in the definition of BootstrapCFlags in your
-* <platform>.cf file.
-* c. When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol"
-* to the end of the command line.
-*
-* Note that you may define more than one symbol (useful for platforms
-* that support multiple operating systems).
-*/
+ * Step 5: cpp_argv
+ * The following table contains the flags that should be passed
+ * whenever a Makefile is being generated. If your preprocessor
+ * doesn't predefine any unique symbols, choose one and add it to the
+ * end of this table. Then, do the following:
+ *
+ * a. Use this symbol in Imake.tmpl when setting MacroFile.
+ * b. Put this symbol in the definition of BootstrapCFlags in your
+ * <platform>.cf file.
+ * c. When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol"
+ * to the end of the command line.
+ *
+ * Note that you may define more than one symbol (useful for platforms
+ * that support multiple operating systems).
+ */
-#define ARGUMENTS 50 /* number of arguments in various arrays */
+#define ARGUMENTS 50 /* number of arguments in various arrays */
char *cpp_argv[ARGUMENTS] = {
- "cc", /* replaced by the actual program to exec */
- "-I.", /* add current directory to include path */
+ "cc", /* replaced by the actual program to exec */
+ "-I.", /* add current directory to include path */
#ifdef unix
- "-Uunix", /* remove unix symbol so that filename unix.c okay */
+ "-Uunix", /* remove unix symbol so that filename unix.c okay */
#endif
#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH)
# ifdef __i386__
- "-D__i386__",
+ "-D__i386__",
# endif
# ifdef __GNUC__
- "-traditional",
+ "-traditional",
# endif
#endif
#ifdef M4330
- "-DM4330", /* Tektronix */
+ "-DM4330", /* Tektronix */
#endif
#ifdef M4310
- "-DM4310", /* Tektronix */
+ "-DM4310", /* Tektronix */
#endif
#if defined(macII) || defined(_AUX_SOURCE)
- "-DmacII", /* Apple A/UX */
+ "-DmacII", /* Apple A/UX */
#endif
#if defined(USL) || defined(__USLC__)
- "-DUSL", /* USL */
+ "-DUSL", /* USL */
#endif
#ifdef sony
- "-Dsony", /* Sony */
+ "-Dsony", /* Sony */
#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
- "-Dbsd43",
+ "-Dbsd43",
#endif
#endif
#ifdef _IBMR2
- "-D_IBMR2", /* IBM RS-6000 (we ensured that aix is defined above */
+ "-D_IBMR2", /* IBM RS-6000 (we ensured that aix is defined above */
#ifndef aix
-#define aix /* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
+#define aix /* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
#endif
#endif /* _IBMR2 */
#ifdef aix
- "-Daix", /* AIX instead of AOS */
+ "-Daix", /* AIX instead of AOS */
#ifndef ibm
-#define ibm /* allow BOOTSTRAPCFLAGS="-Daix" */
+#define ibm /* allow BOOTSTRAPCFLAGS="-Daix" */
#endif
#endif /* aix */
#ifdef ibm
- "-Dibm", /* IBM PS/2 and RT under both AOS and AIX */
+ "-Dibm", /* IBM PS/2 and RT under both AOS and AIX */
#endif
#ifdef luna
- "-Dluna", /* OMRON luna 68K and 88K */
+ "-Dluna", /* OMRON luna 68K and 88K */
#ifdef luna1
- "-Dluna1",
+ "-Dluna1",
#endif
-#ifdef luna88k /* need not on UniOS-Mach Vers. 1.13 */
- "-traditional", /* for some older version */
-#endif /* instead of "-DXCOMM=\\#" */
+#ifdef luna88k /* need not on UniOS-Mach Vers. 1.13 */
+ "-traditional", /* for some older version */
+#endif /* instead of "-DXCOMM=\\#" */
#ifdef uniosb
- "-Duniosb",
+ "-Duniosb",
#endif
#ifdef uniosu
- "-Duniosu",
+ "-Duniosu",
#endif
#endif /* luna */
-#ifdef _CRAY /* Cray */
- "-Ucray",
+#ifdef _CRAY /* Cray */
+ "-Ucray",
#endif
#ifdef Mips
- "-DMips", /* Define and use Mips for Mips Co. OS/mach. */
+ "-DMips", /* Define and use Mips for Mips Co. OS/mach. */
# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
- "-DBSD43", /* Mips RISCOS supports two environments */
+ "-DBSD43", /* Mips RISCOS supports two environments */
# else
-"-DSYSV", /* System V environment is the default */
+ "-DSYSV", /* System V environment is the default */
# endif
#endif /* Mips */
#ifdef MOTOROLA
- "-DMOTOROLA", /* Motorola Delta Systems */
+ "-DMOTOROLA", /* Motorola Delta Systems */
# ifdef SYSV
- "-DSYSV",
+ "-DSYSV",
# endif
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
#endif /* MOTOROLA */
#if defined(M_UNIX) || defined(sco)
- "-Dsco",
- "-DSYSV",
+ "-Dsco",
+ "-DSYSV",
#endif
#ifdef i386
- "-Di386",
+ "-Di386",
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
# ifdef SYSV
- "-DSYSV",
+ "-DSYSV",
# ifdef ISC
- "-DISC",
+ "-DISC",
# ifdef ISC40
- "-DISC40", /* ISC 4.0 */
+ "-DISC40", /* ISC 4.0 */
# else
# ifdef ISC202
-"-DISC202", /* ISC 2.0.2 */
+ "-DISC202", /* ISC 2.0.2 */
# else
# ifdef ISC30
-"-DISC30", /* ISC 3.0 */
+ "-DISC30", /* ISC 3.0 */
# else
-"-DISC22", /* ISC 2.2.1 */
+ "-DISC22", /* ISC 2.2.1 */
# endif
# endif
# endif
# endif
# ifdef SCO
- "-DSCO",
+ "-DSCO",
# ifdef _SCO_DS
- "-DSCO325 -DSVR4",
+ "-DSCO325 -DSVR4",
# endif
# endif
# endif
# ifdef ESIX
- "-DESIX",
+ "-DESIX",
# endif
# ifdef ATT
- "-DATT",
+ "-DATT",
# endif
# ifdef DELL
- "-DDELL",
+ "-DDELL",
# endif
#endif
#ifdef SYSV386 /* System V/386 folks, obsolete */
- "-Di386",
+ "-Di386",
# ifdef SVR4
- "-DSVR4",
+ "-DSVR4",
# endif
# ifdef ISC
- "-DISC",
+ "-DISC",
# ifdef ISC40
- "-DISC40", /* ISC 4.0 */
+ "-DISC40", /* ISC 4.0 */
# else
# ifdef ISC202
-"-DISC202", /* ISC 2.0.2 */
+ "-DISC202", /* ISC 2.0.2 */
# else
# ifdef ISC30
-"-DISC30", /* ISC 3.0 */
+ "-DISC30", /* ISC 3.0 */
# else
-"-DISC22", /* ISC 2.2.1 */
+ "-DISC22", /* ISC 2.2.1 */
# endif
# endif
# endif
# endif
# ifdef SCO
- "-DSCO",
+ "-DSCO",
# ifdef _SCO_DS
- "-DSCO325 -DSVR4",
+ "-DSCO325 -DSVR4",
# endif
# endif
# ifdef ESIX
- "-DESIX",
+ "-DESIX",
# endif
# ifdef ATT
- "-DATT",
+ "-DATT",
# endif
# ifdef DELL
- "-DDELL",
+ "-DDELL",
# endif
#endif
#ifdef __osf__
- "-D__osf__",
+ "-D__osf__",
# ifdef __mips__
- "-D__mips__",
+ "-D__mips__",
# endif
# ifdef __alpha
- "-D__alpha",
+ "-D__alpha",
# endif
# ifdef __alpha__
- "-D__alpha__",
+ "-D__alpha__",
# endif
# ifdef __i386__
- "-D__i386__",
+ "-D__i386__",
# endif
# ifdef __GNUC__
- "-traditional",
+ "-traditional",
# endif
#endif
#ifdef Oki
- "-DOki",
+ "-DOki",
#endif
#ifdef sun
#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)
- "-DSVR4",
+ "-DSVR4",
#endif
#endif
#ifdef WIN32
- "-DWIN32",
- "-nologo",
+ "-DWIN32",
+ "-nologo",
#if _MSC_VER < 1000
- "-batch",
+ "-batch",
#endif
- "-D__STDC__",
+ "-D__STDC__",
#endif
#ifdef NCR
- "-DNCR", /* NCR */
+ "-DNCR", /* NCR */
#endif
#ifdef linux
- "-traditional",
- "-Dlinux",
+ "-traditional",
+ "-Dlinux",
#endif
#ifdef __uxp__
- "-D__uxp__",
+ "-D__uxp__",
#endif
#ifdef __sxg__
- "-D__sxg__",
+ "-D__sxg__",
#endif
#ifdef nec_ews_svr2
- "-Dnec_ews_svr2",
+ "-Dnec_ews_svr2",
#endif
#ifdef AMOEBA
- "-DAMOEBA",
+ "-DAMOEBA",
# ifdef CROSS_COMPILE
- "-DCROSS_COMPILE",
+ "-DCROSS_COMPILE",
# ifdef CROSS_i80386
- "-Di80386",
+ "-Di80386",
# endif
# ifdef CROSS_sparc
- "-Dsparc",
+ "-Dsparc",
# endif
# ifdef CROSS_mc68000
- "-Dmc68000",
+ "-Dmc68000",
# endif
# else
# ifdef i80386
-"-Di80386",
+ "-Di80386",
# endif
# ifdef sparc
-"-Dsparc",
+ "-Dsparc",
# endif
# ifdef mc68000
-"-Dmc68000",
+ "-Dmc68000",
# endif
# endif
#endif
#if defined(__sgi) && defined(__ANSI_CPP__)
- "-cckr",
+ "-cckr",
#endif
#ifdef __minix_vmd
- "-Dminix",
+ "-Dminix",
#endif
#if defined(__EMX__)
- "-traditional",
- "-Demxos2",
+ "-traditional",
+ "-Demxos2",
#endif
};
/*
-* Step 6: DEFAULT_OS_MAJOR_REV, DEFAULT_OS_MINOR_REV, DEFAULT_OS_TEENY_REV,
-* and DEFAULT_OS_NAME.
-* If your systems provides a way to generate the default major,
-* minor, teeny, or system names at runtime add commands below.
-* The syntax of the _REV strings is 'f fmt' where 'f' is an argument
-* you would give to uname, and "fmt" is a scanf() format string.
-* Supported uname arguments are "snrvm", and if you specify multiple
-* arguments they will be separated by spaces. No more than 5 arguments
-* may be given. Unlike uname() order of arguments matters.
-*
-* DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
-* DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
-* modify the results of the use of the various strings.
-*/
+ * Step 6: DEFAULT_OS_MAJOR_REV, DEFAULT_OS_MINOR_REV, DEFAULT_OS_TEENY_REV,
+ * and DEFAULT_OS_NAME.
+ * If your systems provides a way to generate the default major,
+ * minor, teeny, or system names at runtime add commands below.
+ * The syntax of the _REV strings is 'f fmt' where 'f' is an argument
+ * you would give to uname, and "fmt" is a scanf() format string.
+ * Supported uname arguments are "snrvm", and if you specify multiple
+ * arguments they will be separated by spaces. No more than 5 arguments
+ * may be given. Unlike uname() order of arguments matters.
+ *
+ * DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
+ * DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
+ * modify the results of the use of the various strings.
+ */
#if defined(aix)
/* uname -v returns "x" (e.g. "4"), and uname -r returns "y" (e.g. "1") */
-# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %[0-9]"
+# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %[0-9]"
/* No information available to generate default OSTeenyVersion value. */
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(sony)
/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
-# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(hpux)
/* uname -r returns "W.x.yz", e.g. "B.10.01" */
-# define DEFAULT_OS_MAJOR_REV "r %*[^.].%[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s"
-# define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %*[^.].%[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s"
+# define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(USL) || defined(__USLC__)
/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
-# define DEFAULT_OS_MINOR_REV "v %*d.%1s"
-# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "v %[0-9]"
+# define DEFAULT_OS_MINOR_REV "v %*d.%1s"
+# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(__osf__)
/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
-# define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*[^.].%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*[^.].%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(__uxp__)
/* NOTE: "x.y[.z]" above handles UXP/DF. This is a sample alternative. */
/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */
-# define DEFAULT_OS_MAJOR_REV "v V%[0-9]"
-# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]"
-# define DEFAULT_OS_NAME "srvm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "v V%[0-9]"
+# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]"
+# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(linux)
-# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME "srm %[^\n]"
+# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
+# define DEFAULT_OS_NAME "srm %[^\n]"
#elif defined(ISC)
/* ISC all Versions ? */
/* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
@@ -611,32 +611,32 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
# define DEFAULT_OS_NAME "srm %[^\n]"
/* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
-# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
- do { \
- if (*buf == 0) { \
- int __mib[2]; \
- size_t __len; \
- int __osrel; \
- \
- __mib[0] = CTL_KERN; \
- __mib[1] = KERN_OSRELDATE; \
- __len = sizeof(__osrel); \
- sysctl(__mib, 2, &__osrel, &__len, NULL, 0); \
- if (__osrel < 210000) { \
- if (__osrel < 199607) \
- buf[0] = '0'; \
- else if (__osrel < 199612) \
- buf[0] = '5'; \
- else if (__osrel == 199612) \
- buf[0] = '6'; \
- else \
- buf[0] = '8'; /* guess */ \
- } else { \
- buf[0] = ((__osrel / 1000) % 10) + '0'; \
- } \
- buf[1] = 0; \
- } \
- } while (0)
+# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
+ do { \
+ if (*buf == 0) { \
+ int __mib[2]; \
+ size_t __len; \
+ int __osrel; \
+ \
+ __mib[0] = CTL_KERN; \
+ __mib[1] = KERN_OSRELDATE; \
+ __len = sizeof(__osrel); \
+ sysctl(__mib, 2, &__osrel, &__len, NULL, 0); \
+ if (__osrel < 210000) { \
+ if (__osrel < 199607) \
+ buf[0] = '0'; \
+ else if (__osrel < 199612) \
+ buf[0] = '5'; \
+ else if (__osrel == 199612) \
+ buf[0] = '6'; \
+ else \
+ buf[0] = '8'; /* guess */ \
+ } else { \
+ buf[0] = ((__osrel / 1000) % 10) + '0'; \
+ } \
+ buf[1] = 0; \
+ } \
+ } while (0)
#elif defined(__OpenBSD__)
/* uname -r returns "x.y", e.g. "3.7" */
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
@@ -645,274 +645,278 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_MACHINE_ARCHITECTURE "m %[^\n]"
#elif defined(__NetBSD__)
/*
-* uname -r returns "x.y([ABCD...]|_mumble)", e.g.:
-* 1.2 1.2_BETA 1.2A 1.2B
-*
-* That means that we have to do something special to turn the
-* TEENY revision into a form that we can use (i.e., a string of
-* decimal digits).
-*
-* We also frob the name DEFAULT_OS_NAME so that it looks like the
-* 'standard' NetBSD name for the version, e.g. "NetBSD/i386 1.2B" for
-* NetBSD 1.2B on an i386.
-*/
+ * uname -r returns "x.y([ABCD...]|_mumble)", e.g.:
+ * 1.2 1.2_BETA 1.2A 1.2B
+ *
+ * That means that we have to do something special to turn the
+ * TEENY revision into a form that we can use (i.e., a string of
+ * decimal digits).
+ *
+ * We also frob the name DEFAULT_OS_NAME so that it looks like the
+ * 'standard' NetBSD name for the version, e.g. "NetBSD/i386 1.2B" for
+ * NetBSD 1.2B on an i386.
+ */
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "r %*d.%*d%[A-Z]"
-# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
- do { \
- if (*(buf) >= 'A' && *(buf) <= 'Z') /* sanity check */ \
- snprintf((buf), (size), "%d", *(buf) - 'A' + 1); \
- else \
- *(buf) = '\0'; \
- } while (0)
+# define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
+ do { \
+ if (*(buf) >= 'A' && *(buf) <= 'Z') /* sanity check */ \
+ snprintf((buf), (size), "%d", *(buf) - 'A' + 1); \
+ else \
+ *(buf) = '\0'; \
+ } while (0)
# define DEFAULT_OS_NAME "smr %[^\n]"
-# define DEFAULT_OS_NAME_FROB(buf, size) \
- do { \
- char *__sp; \
- if ((__sp = strchr((buf), ' ')) != NULL) \
- *__sp = '/'; \
- } while (0)
+# define DEFAULT_OS_NAME_FROB(buf, size) \
+ do { \
+ char *__sp; \
+ if ((__sp = strchr((buf), ' ')) != NULL) \
+ *__sp = '/'; \
+ } while (0)
#endif
#else /* else MAKEDEPEND */
/*
-* Step 7: predefs
-* If your compiler and/or preprocessor define any specific symbols, add
-* them to the the following table. The definition of struct symtab is
-* in util/makedepend/def.h.
-*/
-struct symtab predefs[] = {
+ * Step 7: predefs
+ * If your compiler and/or preprocessor define any specific symbols, add
+ * them to the the following table. The definition of struct symtab is
+ * in util/makedepend/def.h.
+ */
+struct symtab predefs[] = {
#ifdef apollo
- {"apollo", "1"},
+ {"apollo", "1"},
#endif
-#if defined(clipper) || defined(__clipper__) {"clipper", "1"
-}, {"__clipper__", "1"}, {"clix", "1"}, {"__clix__", "1"},
+#if defined(clipper) || defined(__clipper__)
+ {"clipper", "1"},
+ {"__clipper__", "1"},
+ {"clix", "1"},
+ {"__clix__", "1"},
#endif
#ifdef ibm032
-{"ibm032", "1"},
+ {"ibm032", "1"},
#endif
#ifdef ibm
-{"ibm", "1"},
+ {"ibm", "1"},
#endif
#ifdef aix
-{"aix", "1"},
+ {"aix", "1"},
#endif
#ifdef sun
-{"sun", "1"},
+ {"sun", "1"},
#endif
#ifdef sun2
-{"sun2", "1"},
+ {"sun2", "1"},
#endif
#ifdef sun3
-{"sun3", "1"},
+ {"sun3", "1"},
#endif
#ifdef sun4
-{"sun4", "1"},
+ {"sun4", "1"},
#endif
#ifdef sparc
-{"sparc", "1"},
+ {"sparc", "1"},
#endif
#ifdef __sparc__
-{"__sparc__", "1"},
+ {"__sparc__", "1"},
#endif
#ifdef hpux
-{"hpux", "1"},
+ {"hpux", "1"},
#endif
#ifdef __hpux
-{"__hpux", "1"},
+ {"__hpux", "1"},
#endif
#ifdef __hp9000s800
-{"__hp9000s800", "1"},
+ {"__hp9000s800", "1"},
#endif
#ifdef __hp9000s700
-{"__hp9000s700", "1"},
+ {"__hp9000s700", "1"},
#endif
#ifdef vax
-{"vax", "1"},
+ {"vax", "1"},
#endif
#ifdef VMS
-{"VMS", "1"},
+ {"VMS", "1"},
#endif
#ifdef cray
-{"cray", "1"},
+ {"cray", "1"},
#endif
#ifdef CRAY
-{"CRAY", "1"},
+ {"CRAY", "1"},
#endif
#ifdef _CRAY
-{"_CRAY", "1"},
+ {"_CRAY", "1"},
#endif
#ifdef att
-{"att", "1"},
+ {"att", "1"},
#endif
#ifdef mips
-{"mips", "1"},
+ {"mips", "1"},
#endif
#ifdef __mips__
-{"__mips__", "1"},
+ {"__mips__", "1"},
#endif
#ifdef ultrix
-{"ultrix", "1"},
+ {"ultrix", "1"},
#endif
#ifdef stellar
-{"stellar", "1"},
+ {"stellar", "1"},
#endif
#ifdef mc68000
-{"mc68000", "1"},
+ {"mc68000", "1"},
#endif
#ifdef mc68020
-{"mc68020", "1"},
+ {"mc68020", "1"},
#endif
#ifdef __GNUC__
-{"__GNUC__", "1"},
+ {"__GNUC__", "1"},
#endif
#if __STDC__
-{"__STDC__", "1"},
+ {"__STDC__", "1"},
#endif
#ifdef __HIGHC__
-{"__HIGHC__", "1"},
+ {"__HIGHC__", "1"},
#endif
#ifdef CMU
-{"CMU", "1"},
+ {"CMU", "1"},
#endif
#ifdef linux
-{"linux", "1"},
+ {"linux", "1"},
#endif
#ifdef luna
-{"luna", "1"},
+ {"luna", "1"},
#ifdef luna1
-{"luna1", "1"},
+ {"luna1", "1"},
#endif
#ifdef luna2
-{"luna2", "1"},
+ {"luna2", "1"},
#endif
#ifdef luna88k
-{"luna88k", "1"},
+ {"luna88k", "1"},
#endif
#ifdef uniosb
-{"uniosb", "1"},
+ {"uniosb", "1"},
#endif
#ifdef uniosu
-{"uniosu", "1"},
+ {"uniosu", "1"},
#endif
#endif
#ifdef ieeep754
-{"ieeep754", "1"},
+ {"ieeep754", "1"},
#endif
#ifdef is68k
-{"is68k", "1"},
+ {"is68k", "1"},
#endif
#ifdef m68k
-{"m68k", "1"},
+ {"m68k", "1"},
#endif
#ifdef m88k
-{"m88k", "1"},
+ {"m88k", "1"},
#endif
#ifdef __m88k__
-{"__m88k__", "1"},
+ {"__m88k__", "1"},
#endif
#ifdef bsd43
-{"bsd43", "1"},
+ {"bsd43", "1"},
#endif
#ifdef hcx
-{"hcx", "1"},
+ {"hcx", "1"},
#endif
#ifdef sony
-{"sony", "1"},
+ {"sony", "1"},
#ifdef SYSTYPE_SYSV
-{"SYSTYPE_SYSV", "1"},
+ {"SYSTYPE_SYSV", "1"},
#endif
#ifdef _SYSTYPE_SYSV
-{"_SYSTYPE_SYSV", "1"},
+ {"_SYSTYPE_SYSV", "1"},
#endif
#endif
#ifdef __OSF__
-{"__OSF__", "1"},
+ {"__OSF__", "1"},
#endif
#ifdef __osf__
-{"__osf__", "1"},
+ {"__osf__", "1"},
#endif
#ifdef __alpha
-{"__alpha", "1"},
+ {"__alpha", "1"},
#endif
#ifdef __alpha__
-{"__alpha__", "1"},
+ {"__alpha__", "1"},
#endif
#ifdef __DECC
-{"__DECC", "1"},
+ {"__DECC", "1"},
#endif
#ifdef __decc
-{"__decc", "1"},
+ {"__decc", "1"},
#endif
#ifdef __unix__
-{"__unix__", "1"},
+ {"__unix__", "1"},
#endif
#ifdef __uxp__
-{"__uxp__", "1"},
+ {"__uxp__", "1"},
#endif
#ifdef __sxg__
-{"__sxg__", "1"},
+ {"__sxg__", "1"},
#endif
#ifdef _SEQUENT_
-{"_SEQUENT_", "1"}, {"__STDC__", "1"},
+ {"_SEQUENT_", "1"},
+ {"__STDC__", "1"},
#endif
#ifdef __bsdi__
-{"__bsdi__", "1"},
+ {"__bsdi__", "1"},
#endif
#ifdef nec_ews_svr2
-{"nec_ews_svr2", "1"},
+ {"nec_ews_svr2", "1"},
#endif
#ifdef nec_ews_svr4
-{"nec_ews_svr4", "1"},
+ {"nec_ews_svr4", "1"},
#endif
#ifdef _nec_ews_svr4
-{"_nec_ews_svr4", "1"},
+ {"_nec_ews_svr4", "1"},
#endif
#ifdef _nec_up
-{"_nec_up", "1"},
+ {"_nec_up", "1"},
#endif
#ifdef SX
-{"SX", "1"},
+ {"SX", "1"},
#endif
#ifdef nec
-{"nec", "1"},
+ {"nec", "1"},
#endif
#ifdef _nec_ft
-{"_nec_ft", "1"},
+ {"_nec_ft", "1"},
#endif
#ifdef PC_UX
-{"PC_UX", "1"},
+ {"PC_UX", "1"},
#endif
#ifdef sgi
-{"sgi", "1"},
+ {"sgi", "1"},
#endif
#ifdef __sgi
-{"__sgi", "1"},
+ {"__sgi", "1"},
#endif
#ifdef __FreeBSD__
-{"__FreeBSD__", "1"},
+ {"__FreeBSD__", "1"},
#endif
#ifdef __OpenBSD__
-{"__OpenBSD__", "1"},
+ {"__OpenBSD__", "1"},
#endif
#ifdef __NetBSD__
-{"__NetBSD__", "1"},
+ {"__NetBSD__", "1"},
#endif
#ifdef __ELF__
-{"__ELF__", "1"},
+ {"__ELF__", "1"},
#endif
#ifdef __EMX__
-{"__EMX__", "1"},
+ {"__EMX__", "1"},
#endif
#ifdef __APPLE__
-{"__APPLE__", "1"},
+ {"__APPLE__", "1"},
#endif
#ifdef __ppc__
-{"__ppc__", "1"},
+ {"__ppc__", "1"},
#endif
-/* add any additional symbols before this line */
-{NULL, NULL}
+ /* add any additional symbols before this line */
+ {NULL, NULL}
};
#endif /* MAKEDEPEND */