Changeset 698 for trunk/server/source3/lib

Timestamp:

Apr 23, 2012, 7:29:26 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: some high-mem workarounds removed

File:

• trunk/server/source3/lib/os2helper.c (modified) (2 diffs)

trunk/server/source3/lib/os2helper.c

@@ -180 +180 @@
 */
 
-// OS/2 specific pipe implementation, we have to use socketpair as select on filehandle is not working
-// and we have to use local variables to be sure we use low mem, as socketpair doesn't work in high mem
+/* OS/2 specific pipe implementation, we have to use socketpair as select on 
+filehandle is not working. */
 int os2_pipe(int fds[2])
 {
-        int mypair[2];
         int rc = 0;
 
-        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, mypair);
-        if (rc >= 0) {
-                fds[0] = mypair[0];
-                fds[1] = mypair[1];
-        }
-
+        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
         return rc;
 }
 
+#if 0
 // OS/2 specific connect() implementation, as it only works in low mem
 int os2_connect(int fd, const struct sockaddr *address, int address_len)
@@ -212 +207 @@
         return rc;
 }
+#endif
 
 /* OS/2-specific random functions. these functions used to be based on APR