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 aa0f678f26f93205e60b8975e009c392373f89c6..23762542502112262e4935fcfdc9491cf41d1266 100644 (file)
--- a/cde/programs/dtsession/SmConMgmt.c
+++ b/cde/programs/dtsession/SmConMgmt.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * 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
  */
@@ -55,7 +55,7 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#if !defined(linux)
+#if !defined(__linux__)
 #include <nlist.h>
 #endif
 #include <X11/Intrinsic.h>
@@ -109,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;
@@ -160,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;
@@ -375,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
  *
  *