r8713: Experiment to try and fix warnings on 64-bit machines without breaking

32-bit ones.  Yes, this weird looking macros are part of C99.

diff --git a/source/build/m4/rewrite.m4 b/source/build/m4/rewrite.m4
index 35482b6ceccfda2f902bf052e6d1eecac4a25756..fd19de5d17e7febfe676596e90fb4a82bf0ccce6 100644 (file)
--- a/source/build/m4/rewrite.m4
+++ b/source/build/m4/rewrite.m4
@@ -63,7 +63,7 @@ AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
 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)

diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index 448e4292aa4c4f73c7b7ca001ab5214988c1d8ab..7811ca19651122435f06695f21178bc7789b4e05 100644 (file)
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -852,7 +852,7 @@ int samdb_msg_add_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 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_int64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 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);
 }
 

diff --git a/source/include/includes.h b/source/include/includes.h
index 88ee4af3b05d4fdef46e249d50bc8dde66ac631d..58799d9b8696654892ccef9f9a22f04c73c952cd 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -47,6 +47,10 @@
 #include <stdint.h>
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif