Changeset 1696Tweet

Timestamp:

01/18/07 13:32:31 (6 years ago)

Author:

sam

Message:

• Check recv() return type: int on Linux, ssize_t on OS X.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• src/lib-fd.c (modified) (4 diffs)

zzuf/trunk/configure.ac

@@ -33 +33 @@
  [AC_MSG_RESULT(int read(... unsigned int);)])
 
+AC_MSG_CHECKING(for recv() return value)
+ac_v_recv_t="int"
+AC_TRY_COMPILE([#include <sys/types.h>
+  #include <sys/socket.h>],
+ [ssize_t recv(int s, void *buf, size_t len, int flags);],
+ [ac_v_recv_t="ssize_t"])
+AC_MSG_RESULT($ac_v_recv_t)
+AC_DEFINE_UNQUOTED(RECV_T, $ac_v_recv_t, [Define to the recv() return type])
+
 AC_CHECK_FUNCS(getopt_long,
  [AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the `getopt_long' function.)],

zzuf/trunk/src/lib-fd.c

@@ -81 +81 @@
 #endif
 #if defined HAVE_RECV
-static int     (*recv_orig)    (int s, void *buf, size_t len, int flags);
+static RECV_T  (*recv_orig)    (int s, void *buf, size_t len, int flags);
 #endif
 #if defined HAVE_RECVFROM
-static int     (*recvfrom_orig)(int s, void *buf, size_t len, int flags,
+static RECV_T  (*recvfrom_orig)(int s, void *buf, size_t len, int flags,
                                 struct sockaddr *from, SOCKLEN_T *fromlen);
 #endif
 #if defined HAVE_RECVMSG
-static int     (*recvmsg_orig) (int s,  struct msghdr *hdr, int flags);
+static RECV_T  (*recvmsg_orig) (int s,  struct msghdr *hdr, int flags);
 #endif
 #if defined READ_USES_SSIZE_T
@@ -196 +196 @@
 
 #if defined HAVE_RECV
-int recv(int s, void *buf, size_t len, int flags)
+RECV_T recv(int s, void *buf, size_t len, int flags)
 {
     int ret;
@@ -228 +228 @@
 
 #if defined HAVE_RECVFROM
-int recvfrom(int s, void *buf, size_t len, int flags,
+RECV_T recvfrom(int s, void *buf, size_t len, int flags,
              struct sockaddr *from, SOCKLEN_T *fromlen) 
 {
@@ -262 +262 @@
 
 #if defined HAVE_RECVMSG
-int recvmsg(int s, struct msghdr *hdr, int flags)
+RECV_T recvmsg(int s, struct msghdr *hdr, int flags)
 {
     ssize_t ret;