Use POSIX macros for linux

[oweals/cde.git] / cde / programs / dtsession / SmConMgmt.c

diff --git a/cde/programs/dtsession/SmConMgmt.c b/cde/programs/dtsession/SmConMgmt.c
index b2869fc0fae13756bc744f43d75cde5601d27f5e..23762542502112262e4935fcfdc9491cf41d1266 100644 (file)
--- a/cde/programs/dtsession/SmConMgmt.c
+++ b/cde/programs/dtsession/SmConMgmt.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /* $TOG: SmConMgmt.c /main/6 1998/04/06 14:35:42 mgreess $ */
 /*                                                                      *
  * (c) Copyright 1993, 1994 Hewlett-Packard Company                     *
@@ -33,7 +55,7 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#if !defined(linux)
+#if !defined(__linux__)
 #include <nlist.h>
 #endif
 #include <X11/Intrinsic.h>
@@ -87,7 +109,7 @@ int clientRunning;
 /*
  * Variables global to this module only
  */
-#if !defined(linux)
+#if !defined(__linux__)
 static struct nlist namelist[3];
 #endif
 static int freemem_loc, gpgslim_loc, gpgslim, freemem;
@@ -138,10 +160,10 @@ static void WaitClientTimeout(XtPointer, XtIntervalId *);
 int 
 GetMemoryUtilization(void)
 {
-#if !defined(linux)
+#if !defined(__linux__)
     static int init = 0;
-    static kmem;
-#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__)
+    static int kmem;
+#if !defined(SVR4) && !defined(hpV4) && !defined(_POWER) && !defined(CSRG_BASED)
     extern void nlist();
 #endif
     int i;
@@ -353,7 +375,7 @@ WaitClientTimeout(
  *
  *  Description:
  *  -----------
- *  This is the event handler registered to recieve the client message
+ *  This is the event handler registered to receive the client message
  *  from dtwm when a client has beem managed
  *
  *