summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-14 12:00:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:23:05 -0500
commit978bbb4f4da3078c0c562cfccc18b76f518eccea (patch)
treeb5ff25fa6e3727f848bbbc09ef7a71d4c3aaaafd
parentc77f4a68c61282829a01419fbd952dedc0f1c4fe (diff)
downloadsamba-978bbb4f4da3078c0c562cfccc18b76f518eccea.tar.gz
samba-978bbb4f4da3078c0c562cfccc18b76f518eccea.tar.bz2
samba-978bbb4f4da3078c0c562cfccc18b76f518eccea.zip
r8461: fixed integer64 handling on bit endian platforms. The ejs code used
%Ld, which is an invalid format code. This will probably cause problems on systems that don't have %lld, but do have a working snprintf otherwise. We will need to expand the snprintf configure test to make sure we replace snprintf on those platforms (This used to be commit ccc87eb8aaf571d91170555a732d287746b3430f)
-rw-r--r--source4/build/m4/rewrite.m41
-rw-r--r--source4/heimdal_build/config.h1
-rw-r--r--source4/lib/appweb/mpr/var.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 5998801f0c..058cfade3b 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -88,6 +88,7 @@ AC_CHECK_TYPE(loff_t,off_t)
AC_CHECK_TYPE(offset_t,loff_t)
AC_CHECK_TYPES(ssize_t)
AC_CHECK_TYPES(intptr_t)
+AC_CHECK_TYPES(long long)
############################################
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 6bbe947155..5ce029e83c 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -39,7 +39,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
/* these should be done with configure tests */
#define KRB5
-#define HAVE_LONG_LONG
#include <sys/types.h>
#include <stdarg.h>
diff --git a/source4/lib/appweb/mpr/var.c b/source4/lib/appweb/mpr/var.c
index d3d21f7eee..9b02c0f8b0 100644
--- a/source4/lib/appweb/mpr/var.c
+++ b/source4/lib/appweb/mpr/var.c
@@ -1658,7 +1658,7 @@ void mprVarToString(char** out, int size, char *fmt, MprVar *obj)
#if BLD_GOAHEAD_WEBSERVER
mprAllocSprintf(out, size, "%d", (int) obj->integer64);
#else
- mprAllocSprintf(out, size, "%Ld", obj->integer64);
+ mprAllocSprintf(out, size, "%lld", obj->integer64);
#endif
} else {
mprAllocSprintf(out, size, fmt, obj->integer64);