X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fioctl.c;h=7c09d95b49c8aa313b67fca486bfe68ba7713565;hb=95d83dbbfafaabc980a74102f4b3d9ec9b950dd3;hp=98a94b672194a5510b9472ac42f58ce88a0bd6bb;hpb=11ee0e1340f95ccb9954e522f6e003b3125eb109;p=gnulib.git

diff --git a/lib/ioctl.c b/lib/ioctl.c
index 98a94b672..7c09d95b4 100644
--- a/lib/ioctl.c
+++ b/lib/ioctl.c
@@ -1,6 +1,6 @@
 /* ioctl.c --- wrappers for Windows ioctl function
 
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,19 +19,40 @@
 
 #include <config.h>
 
+#include <sys/ioctl.h>
+
 #include <stdarg.h>
 
-#define WIN32_LEAN_AND_MEAN
+#if HAVE_IOCTL
+
+/* Provide a wrapper with the POSIX prototype.  */
+# undef ioctl
+int
+rpl_ioctl (int fd, int request, ... /* {void *,char *} arg */)
+{
+  void *buf;
+  va_list args;
+
+  va_start (args, request);
+  buf = va_arg (args, void *);
+  va_end (args);
+
+  /* Cast 'request' so that when the system's ioctl function takes a 64-bit
+     request argument, the value gets zero-extended, not sign-extended.  */
+  return ioctl (fd, (unsigned int) request, buf);
+}
+
+#else /* mingw */
+
+# define WIN32_LEAN_AND_MEAN
 /* Get winsock2.h. */
-#include <sys/socket.h>
+# include <sys/socket.h>
 
 /* Get set_winsock_errno, FD_TO_SOCKET etc. */
-#include "w32sock.h"
-
-#undef ioctl
+# include "w32sock.h"
 
 int
-rpl_ioctl (int fd, int req, ...)
+ioctl (int fd, int req, ...)
 {
   void *buf;
   va_list args;
@@ -49,3 +70,5 @@ rpl_ioctl (int fd, int req, ...)
 
   return r;
 }
+
+#endif