svn commit: samba r1973 - in branches/SAMBA_4_0/source: build/m4 lib

tridge at samba.org tridge at samba.org
Fri Aug 20 22:50:33 GMT 2004


Author: tridge
Date: 2004-08-20 22:50:33 +0000 (Fri, 20 Aug 2004)
New Revision: 1973

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1973&nolog=1

Log:
for systems that don't have strtoull() try strtouq(). This should fix
the build for some BSD varients.


Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/lib/replace.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2004-08-20 22:49:45 UTC (rev 1972)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2004-08-20 22:50:33 UTC (rev 1973)
@@ -404,7 +404,7 @@
     EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
 fi
 
-AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strerror chown fchown chmod fchmod chroot link mknod mknod64)
+AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strtoull strtouq strerror chown fchown chmod fchmod chroot link mknod mknod64)
 AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync bzero memset strlcpy strlcat setpgid)
 AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid)
 AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)

Modified: branches/SAMBA_4_0/source/lib/replace.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace.c	2004-08-20 22:49:45 UTC (rev 1972)
+++ branches/SAMBA_4_0/source/lib/replace.c	2004-08-20 22:50:33 UTC (rev 1973)
@@ -468,3 +468,15 @@
 	return ret;	
 }
 #endif
+
+
+#ifndef HAVE_STRTOULL
+ unsigned long long int strtoull(const char *str, char **endptr, int base)
+{
+#ifdef HAVE_STRTOUQ
+	return strtouq(str, endptr, base);
+#else
+#error "system must support 64 bit integer read from strings"
+#endif
+}
+#endif



More information about the samba-cvs mailing list