Changeset 2215

Timestamp:

Jul 6, 2005, 5:51:54 AM (20 years ago)

Author:

bird

Message:

o Changed PC setmode to _setmode. As it collides with a BSD 4.4. interface.

Location:

trunk/src/emx

Files:

• include/io.h (modified) (1 diff, 1 prop)
• src/lib/bsd/db/btree/bt_open.c (modified) (1 diff, 1 prop)
• src/lib/bsd/db/hash/hash_page.c (modified) (1 diff, 1 prop)
• src/lib/io/_fsetmod.c (modified) (1 diff, 1 prop)
• src/lib/io/_setmode.c (added)
• src/lib/io/fdopen.c (modified) (1 diff, 1 prop)
• src/lib/io/setmode.c (deleted)

trunk/src/emx/include/io.h

@@ -77 +77 @@
 ssize_t read (int, void *, size_t);
 int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
-int setmode (int, int);
+/* int setmode (int, int); - non standard, should not be in this namespace. besides it conflicts with BSD setmode/getmode. */
 int sopen (__const__ char *, int, int, ...);
 int stat (__const__ char *, struct stat *);

trunk/src/emx/src/lib/bsd/db/btree/bt_open.c

@@ -227 +227 @@
                 if ((t->bt_fd = mkstemp (namestr)) == -1)
                         goto err;
-                setmode (t->bt_fd, O_BINARY);
+                _setmode (t->bt_fd, O_BINARY);
                 if (_abspath (absname, namestr, sizeof (absname)) == 0)
                         t->tempname = strdup (absname);

trunk/src/emx/src/lib/bsd/db/hash/hash_page.c

@@ -883 +883 @@
 #ifdef __EMX__
                 char absname[_MAX_PATH];
-                setmode (hashp->fp, O_BINARY);
+                _setmode (hashp->fp, O_BINARY);
                 if (_abspath (absname, namestr, sizeof (absname)) == 0)
                         hashp->tempname = strdup (absname);

trunk/src/emx/src/lib/io/_fsetmod.c

@@ -20 +20 @@
       return -1;
     }
-  if (setmode (stream->_handle, i) == -1)
+  if (_setmode (stream->_handle, i) == -1)
     return -1;
   return 0;

trunk/src/emx/src/lib/io/fdopen.c

@@ -92 +92 @@
     }
   if (bt)
-    setmode (handle, omode);
+    _setmode (handle, omode);
   dst->_handle = handle;
   dst->_flags |= _IOOPEN | _IOBUFNONE;