svn commit: samba r8713 - in branches/SAMBA_4_0/source: build/m4 dsdb/samdb include

[tpot at samba.org]

Author: tpot
Date: 2005-07-22 11:16:32 +0000 (Fri, 22 Jul 2005)
New Revision: 8713

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

Log:
Experiment to try and fix warnings on 64-bit machines without breaking 
32-bit ones.  Yes, this weird looking macros are part of C99.

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
   branches/SAMBA_4_0/source/include/includes.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-07-22 10:58:49 UTC (rev 8712)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-07-22 11:16:32 UTC (rev 8713)
@@ -63,7 +63,7 @@
 AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h dlfcn.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-AC_CHECK_HEADERS(stdint.h locale.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h locale.h)
 AC_CHECK_HEADERS(shadow.h netdb.h netinet/in.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h)
 AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)

Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2005-07-22 10:58:49 UTC (rev 8712)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2005-07-22 11:16:32 UTC (rev 8713)
@@ -852,7 +852,7 @@
 int samdb_msg_add_int64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
 			const char *attr_name, int64_t v)
 {
-	const char *s = talloc_asprintf(mem_ctx, "%lld", v);
+	const char *s = talloc_asprintf(mem_ctx, "%PRIi64", v);
 	return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
 }
 
@@ -862,7 +862,7 @@
 int samdb_msg_add_uint64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
 			const char *attr_name, uint64_t v)
 {
-	const char *s = talloc_asprintf(mem_ctx, "%llu", v);
+	const char *s = talloc_asprintf(mem_ctx, "%PRIu64", v);
 	return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
 }
 

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-07-22 10:58:49 UTC (rev 8712)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-07-22 11:16:32 UTC (rev 8713)
@@ -47,6 +47,10 @@
 #include <stdint.h>
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif