Changeset 745 for trunk/server/lib/replace/system

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/replace/system/config.m4 (modified) (1 diff)
• lib/replace/system/network.h (modified) (2 diffs)
• lib/replace/system/passwd.h (modified) (1 diff)
• lib/replace/system/readline.h (modified) (1 diff)
• lib/replace/system/select.h (modified) (1 diff)
• lib/replace/system/time.h (modified) (2 diffs)
• lib/replace/system/wait.h (modified) (1 diff)
• lib/replace/system/wscript_configure (copied) (copied from vendor/current/lib/replace/system/wscript_configure )

trunk/server/lib/replace/system/config.m4

@@ -7 +7 @@
 AC_CHECK_HEADERS(sys/select.h)
 
+# poll
+AC_CHECK_HEADERS(poll.h)
+AC_CHECK_FUNCS(poll,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/poll.o"])
+
 # time
 AC_CHECK_HEADERS(sys/time.h utime.h)
 AC_HEADER_TIME
 AC_CHECK_FUNCS(utime utimes)
+
+AC_CACHE_CHECK([if gettimeofday takes TZ argument],libreplace_cv_HAVE_GETTIMEOFDAY_TZ,[
+AC_TRY_RUN([
+#include <sys/time.h>
+#include <unistd.h>
+main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
+           libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=no,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes)])
+if test x"$libreplace_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
+fi
 
 # wait

trunk/server/lib/replace/system/network.h

@@ -310 +310 @@
 #define ss_family sin6_family
 #define HAVE_SS_FAMILY 1
-#else
+#else /*HAVE_STRUCT_SOCKADDR_IN6*/
 #define sockaddr_storage sockaddr_in
 #define ss_family sin_family
 #define HAVE_SS_FAMILY 1
-#endif
-#endif
+#endif /*HAVE_STRUCT_SOCKADDR_IN6*/
+#endif /*HAVE_STRUCT_SOCKADDR_STORAGE*/
 
 #ifndef HAVE_SS_FAMILY
@@ -334 +334 @@
      */
 #   define IOV_MAX 512
-#  else
-#   error IOV_MAX and UIO_MAXIOV undefined
 #  endif
 # endif

trunk/server/lib/replace/system/passwd.h

@@ -102 +102 @@
 
 #ifdef NSS_WRAPPER
+#ifndef NSS_WRAPPER_DISABLE
 #ifndef NSS_WRAPPER_NOT_REPLACE
 #define NSS_WRAPPER_REPLACE
-#endif
+#endif /* NSS_WRAPPER_NOT_REPLACE */
 #include "../nss_wrapper/nss_wrapper.h"
-#endif
+#endif /* NSS_WRAPPER_DISABLE */
+#endif /* NSS_WRAPPER */
 
 #endif

trunk/server/lib/replace/system/readline.h

@@ -44 +44 @@
 
 #ifdef HAVE_NEW_LIBREADLINE
-#  define RL_COMPLETION_CAST (rl_completion_func_t *)
+#ifdef HAVE_CPPFUNCTION
+#  define RL_COMPLETION_CAST (CPPFunction *)
+#elif HAVE_RL_COMPLETION_T
+#  define RL_COMPLETION_CAST (rl_completion_t *)
+#else
+#  define RL_COMPLETION_CAST
+#endif
 #else
 /* This type is missing from libreadline<4.0  (approximately) */

trunk/server/lib/replace/system/select.h

@@ -39 +39 @@
 #endif
 
+#ifdef HAVE_POLL
+
+#include <poll.h>
+
+#else
+
+/* Type used for the number of file descriptors.  */
+typedef unsigned long int nfds_t;
+
+/* Data structure describing a polling request.  */
+struct pollfd
+{
+        int fd;            /* File descriptor to poll.  */
+        short int events;  /* Types of events poller cares about.  */
+        short int revents; /* Types of events that actually occurred.  */
+};
+
+/* Event types that can be polled for.  These bits may be set in `events'
+   to indicate the interesting event types; they will appear in `revents'
+   to indicate the status of the file descriptor.  */
+#define POLLIN          0x001           /* There is data to read.  */
+#define POLLPRI         0x002           /* There is urgent data to read.  */
+#define POLLOUT         0x004           /* Writing now will not block.  */
+#define POLLRDNORM      0x040           /* Normal data may be read.  */
+#define POLLRDBAND      0x080           /* Priority data may be read.  */
+#define POLLWRNORM      0x100           /* Writing now will not block.  */
+#define POLLWRBAND      0x200           /* Priority data may be written.  */
+#define POLLERR         0x008           /* Error condition.  */
+#define POLLHUP         0x010           /* Hung up.  */
+#define POLLNVAL        0x020           /* Invalid polling request.  */
+
+/* define is in "replace.h" */
+int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout);
+
 #endif
+
+#endif

trunk/server/lib/replace/system/time.h

@@ -47 +47 @@
 #endif
 
+#ifndef HAVE_STRUCT_TIMESPEC
+struct timespec {
+        time_t tv_sec;            /* Seconds.  */
+        long tv_nsec;           /* Nanoseconds.  */
+};
+#endif
+
 #ifndef HAVE_MKTIME
 /* define is in "replace.h" */
@@ -67 +74 @@
 #endif
 
+#ifndef HAVE_CLOCK_GETTIME
+/* CLOCK_REALTIME is required by POSIX */
+#define CLOCK_REALTIME 0
+typedef int clockid_t;
+int rep_clock_gettime(clockid_t clk_id, struct timespec *tp);
 #endif
+/* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on */
+#if defined(CLOCK_MONOTONIC)
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_MONOTONIC
+#elif defined(CLOCK_HIGHRES)
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_HIGHRES
+#else
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME
+#endif
+
+#endif

trunk/server/lib/replace/system/wait.h

@@ -37 +37 @@
 #endif
 
-#ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)(int))
-#endif
-
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>