--- a/UnixOperatingSystem.st	Mon Jun 15 15:39:10 1998 +0200
+++ b/UnixOperatingSystem.st	Mon Jun 15 15:43:04 1998 +0200
@@ -3014,7 +3014,7 @@
     int nargs, i, id;
     OBJ arg;
     extern char **environ;
-    char **env, **nEnv;
+    char **_env, **_nEnv;
 
     if (__isString(aCommandPath) && 
         ((argArray == nil) || __isArray(argArray)) &&
@@ -3045,17 +3045,17 @@
             }
 
             if (nNewEnv == 0) {
-                nEnv = environ;
+                _nEnv = environ;
             } else {
-                env = environ;
+                _env = environ;
                 /* 
                  * get size of environment
                  */
                 nOldEnv = 0;
-                if (env) {
-                    while (*env) {
+                if (_env) {
+                    while (*_env) {
                         nOldEnv++;
-                        env++;
+                        _env++;
                     }
                 }
 
@@ -3068,11 +3068,11 @@
                  * at both ends - that should do it in any case.
                  * Someone with more know-how may want to fix this.
                  */
-                nEnv = (char **)malloc(sizeof(char *) * (nNewEnv + nOldEnv + nNewEnv + 1));
-                if (nEnv) {
+                _nEnv = (char **)malloc(sizeof(char *) * (nNewEnv + nOldEnv + nNewEnv + 1));
+                if (_nEnv) {
                     char **eO, **eN;
 
-                    eN = nEnv;
+                    eN = _nEnv;
                     if (nNewEnv) {
                         /*
                          * add new items at the front ...
@@ -3121,7 +3121,7 @@
                         /*
                          * new items again at the end
                          */
-                        for (eO = nEnv, i=0; i<nNewEnv; i++) {
+                        for (eO = _nEnv, i=0; i<nNewEnv; i++) {
                             *eN++ = *eO++;
                         }
 
@@ -3203,7 +3203,7 @@
 #endif
                     }
 
-                    execve(__stringVal(aCommandPath), argv, nEnv);
+                    execve(__stringVal(aCommandPath), argv, _nEnv);
                     /* should not be reached */
                     _exit(127);                 /* POSIX 2 compatible exit value */
                 }
@@ -3212,7 +3212,7 @@
                 /*
                  * no subprocess (i.e. transfer to another program)
                  */
-                execve(__stringVal(aCommandPath), argv, nEnv);
+                execve(__stringVal(aCommandPath), argv, _nEnv);
                 /* 
                  * should not be reached
                  * (well, it is, if you pass a wrong command-path)
@@ -3220,18 +3220,18 @@
                 id = -1;
             }
 
-            if (nNewEnv && (nEnv != NULL)) {
+            if (nNewEnv && (_nEnv != NULL)) {
                 /*
                  * free new environment stuff
                  */
                 for (i=0; i<nNewEnv;i++) {
-                    char *e = nEnv[i];
+                    char *e = _nEnv[i];
 
                     if (e) {
                         free(e);
                     }
                 }
-                free(nEnv);
+                free(_nEnv);
             }
 
             free(argv);
@@ -8481,6 +8481,6 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.24 1998-06-13 17:18:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.25 1998-06-15 13:43:04 cg Exp $'
 ! !
 UnixOperatingSystem initialize!