svn commit: samba r16287 - in branches/SAMBA_3_0/source: . libsmb

jra at samba.org jra at samba.org
Fri Jun 16 02:23:03 GMT 2006


Author: jra
Date: 2006-06-16 02:23:02 +0000 (Fri, 16 Jun 2006)
New Revision: 16287

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16287

Log:
Use intptr_t to return an integer of an unknown type cast
to void *.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-06-16 02:01:31 UTC (rev 16286)
+++ branches/SAMBA_3_0/source/configure.in	2006-06-16 02:23:02 UTC (rev 16287)
@@ -1848,6 +1848,9 @@
 samba_cv_have_longlong=yes,samba_cv_have_longlong=no,samba_cv_have_longlong=cross)])
 if test x"$samba_cv_have_longlong" = x"yes"; then
     AC_DEFINE(HAVE_LONGLONG,1,[Whether the host supports long long's])
+    AC_CHECK_TYPE(intptr_t, unsigned long long)
+else
+    AC_CHECK_TYPE(intptr_t, unsigned long)
 fi
 
 #

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2006-06-16 02:01:31 UTC (rev 16286)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2006-06-16 02:23:02 UTC (rev 16287)
@@ -6036,7 +6036,11 @@
                 /*
                  * Log to standard error instead of standard output.
                  */
+#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
+                return (void *) (intptr_t) context->internal->_debug_stderr;
+#else
                 return (void *) context->internal->_debug_stderr;
+#endif
         } else if (strcmp(option_name, "auth_function") == 0) {
                 /*
                  * Use the new-style authentication function which includes



More information about the samba-cvs mailing list