Use POSIX macros for linux

2018-05-24 16:24:41 -05:00
parent 164e695cd0
commit 4f5e7fe5e3
265 changed files with 394 additions and 394 deletions
--- a/cde/programs/dtcm/dtcm/MonthPanel.c
+++ b/cde/programs/dtcm/dtcm/MonthPanel.c
@@ -70,7 +70,7 @@

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/RFCMIME.c
+++ b/cde/programs/dtcm/dtcm/RFCMIME.c
@@ -57,7 +57,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
 #include <RFCMIME.h>

 /* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(linux)
+#if !defined(__linux__)
 #  include <iconv.h>
 #endif
 #include <EUSCompat.h>
--- a/cde/programs/dtcm/dtcm/calendarA.c
+++ b/cde/programs/dtcm/dtcm/calendarA.c
@@ -132,7 +132,7 @@ static  char sccsid[] = "@(#)calendarA.c 1.196 95/04/12 Copyr 1991 Sun Microsyst
 #include "cmtt.h"
 #endif

-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos.h>
--- a/cde/programs/dtcm/dtcm/cm_i18n.c
+++ b/cde/programs/dtcm/dtcm/cm_i18n.c
@@ -71,7 +71,7 @@ should be fixed in the future.

 #include <langinfo.h>
 /* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(linux)
+#if !defined(__linux__)
 #  include <iconv.h>
 #endif
 #include <EUSCompat.h>
--- a/cde/programs/dtcm/dtcm/dayglance.c
+++ b/cde/programs/dtcm/dtcm/dayglance.c
@@ -81,7 +81,7 @@ static char sccsid[] = "@(#)dayglance.c 1.76 95/04/24 Copyr 1991 Sun Microsystem

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/dnd.c
+++ b/cde/programs/dtcm/dtcm/dnd.c
@@ -72,7 +72,7 @@

 static Bool lookForButton(Display *, XEvent *, XPointer);

-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__linux__) && !defined(CSRG_BASED)
 extern char	*sys_errlist[];
 #endif

--- a/cde/programs/dtcm/dtcm/find.c
+++ b/cde/programs/dtcm/dtcm/find.c
@@ -60,7 +60,7 @@

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/format.c
+++ b/cde/programs/dtcm/dtcm/format.c
@@ -69,7 +69,7 @@ static char sccsid[] = "@(#)format.c 1.27 95/01/19 Copyr 1991 Sun Microsystems,

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/monthglance.c
+++ b/cde/programs/dtcm/dtcm/monthglance.c
@@ -102,7 +102,7 @@ static  char sccsid[] = "@(#)monthglance.c 1.82 95/07/27 Copyr 1994 Sun Microsys

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/tempbr.c
+++ b/cde/programs/dtcm/dtcm/tempbr.c
@@ -89,7 +89,7 @@ static  char sccsid[] = "@(#)tempbr.c 1.48 95/03/28 Copyr 1991 Sun Microsystems,
 static void tb_cancel_cb();
 static void tb_close_cb();
 static void tempbr_show_cb(Widget w, XtPointer data, XtPointer cbs);
-#if defined(linux)
+#if defined(__linux__)
 #include <string.h>
 #else
 extern char *strdup(const char *);
--- a/cde/programs/dtcm/dtcm/weekglance.c
+++ b/cde/programs/dtcm/dtcm/weekglance.c
@@ -78,7 +78,7 @@

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/x_graphics.c
+++ b/cde/programs/dtcm/dtcm/x_graphics.c
@@ -70,7 +70,7 @@

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/dtcm/yearglance.c
+++ b/cde/programs/dtcm/dtcm/yearglance.c
@@ -88,7 +88,7 @@ static char sccsid[] = "@(#)yearglance.c 1.37 95/07/27 Copyr 1991 Sun Microsyste

 #define XOS_USE_XT_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/libDtCmP/timeops.c
+++ b/cde/programs/dtcm/libDtCmP/timeops.c
@@ -58,11 +58,11 @@ static char sccsid[] = "@(#)timeops.c 1.13 95/05/02 Copyr 1991 Sun Microsystems,

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
-#if defined(linux)
+#if defined(__linux__)
 #define SVR4
 #endif

--- a/cde/programs/dtcm/libDtCmP/util.c
+++ b/cde/programs/dtcm/libDtCmP/util.c
@@ -69,7 +69,7 @@
 #define X_INCLUDE_STRING_H
 #define X_INCLUDE_TIME_H
 #define XOS_USE_NO_LOCKING
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/garbage.c
+++ b/cde/programs/dtcm/server/garbage.c
@@ -35,7 +35,7 @@
 #include	<stdlib.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/lexit.c
+++ b/cde/programs/dtcm/server/lexit.c
@@ -428,7 +428,7 @@ setinput (FILE* f)
 	return(-1);
      }

-#if !defined(linux)
+#if !defined(__linux__)
  /* no madvise so we lose this optimization */
  madvise(start_of_mmapped_area, len, MADV_SEQUENTIAL);
 #endif
--- a/cde/programs/dtcm/server/log.c
+++ b/cde/programs/dtcm/server/log.c
@@ -39,7 +39,7 @@
 #include <sys/file.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/parser.y
+++ b/cde/programs/dtcm/server/parser.y
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if (defined(sun) && defined(_XOPEN_SOURCE)) || defined(linux)
+#if (defined(sun) && defined(_XOPEN_SOURCE)) || defined(__linux__)
 #include <time.h>
 #endif
 #include "csa.h"
--- a/cde/programs/dtcm/server/reclotick.c
+++ b/cde/programs/dtcm/server/reclotick.c
@@ -30,7 +30,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/recount.c
+++ b/cde/programs/dtcm/server/recount.c
@@ -30,7 +30,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/relasttick.c
+++ b/cde/programs/dtcm/server/relasttick.c
@@ -30,7 +30,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/renexttick.c
+++ b/cde/programs/dtcm/server/renexttick.c
@@ -31,7 +31,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/repeat.c
+++ b/cde/programs/dtcm/server/repeat.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/reprevtick.c
+++ b/cde/programs/dtcm/server/reprevtick.c
@@ -30,7 +30,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/reutil.c
+++ b/cde/programs/dtcm/server/reutil.c
@@ -37,7 +37,7 @@

 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
-#if defined(linux)
+#if defined(__linux__)
 #undef SVR4
 #endif
 #include <X11/Xos_r.h>
--- a/cde/programs/dtcm/server/svcmain.c
+++ b/cde/programs/dtcm/server/svcmain.c
@@ -28,7 +28,7 @@
 *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
 */

-#if defined(linux)
+#if defined(__linux__)
 #define _POSIX_C_SOURCE 2
 #endif

@@ -493,7 +493,7 @@ init_alarm()
 	extern void garbage_collect();
 	extern void debug_switch();

-#if defined(SVR4) && !defined(linux)
+#if defined(SVR4) && !defined(__linux__)
 	extern void (*sigset(int, void (*)(int)))(int);
 	sigset(SIGUSR1, garbage_collect);
 	sigset(SIGALRM, garbage_collect);
@@ -695,7 +695,7 @@ main(int argc, char **argv)

 		if (udp_transp == (SVCXPRT *)-1) {
 			udp_transp = svcudp_create(standalone ? RPC_ANYSOCK : 0
-#if defined(_AIX) || defined(hpV4) || defined(linux) || defined(CSRG_BASED)
+#if defined(_AIX) || defined(hpV4) || defined(__linux__) || defined(CSRG_BASED)
 					);
 #else
 					,0,0);
--- a/cde/programs/dtcm/server/utility.c
+++ b/cde/programs/dtcm/server/utility.c
@@ -41,7 +41,7 @@
 #include "utility.h"
 #include "lutil.h"

-#if !defined(linux)
+#if !defined(__linux__)
 extern char * strdup(const char *);
 #endif