summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-06-02 08:44:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:48 -0500
commit4b74445676cb601e16e96d70224604d9bd6248c2 (patch)
tree31949bf8e7d55e3629760d17a2843d90167fa6c5 /source4
parentb17ee8feb75123a2334510db4015b355565013eb (diff)
downloadsamba-4b74445676cb601e16e96d70224604d9bd6248c2.tar.gz
samba-4b74445676cb601e16e96d70224604d9bd6248c2.tar.bz2
samba-4b74445676cb601e16e96d70224604d9bd6248c2.zip
r16002: fix the build on solaris
Patch from Bjoern Jacke, thanks! metze (This used to be commit 1250355909533e033f30e6a960c58cfc9ec760ba)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/appweb/ejs/config.h2
-rw-r--r--source4/lib/appweb/mpr/miniMpr.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/appweb/ejs/config.h b/source4/lib/appweb/ejs/config.h
index de8a1096c9..feec3c9e5b 100644
--- a/source4/lib/appweb/ejs/config.h
+++ b/source4/lib/appweb/ejs/config.h
@@ -58,7 +58,7 @@
#define BLD_FEATURE_MALLOC_STATS 0
#define BLD_FEATURE_MALLOC_LEAK 0
#define BLD_FEATURE_MALLOC_HOOK 0
-#define BLD_FEATURE_NUM_TYPE int64
+#define BLD_FEATURE_NUM_TYPE int64_t
#define BLD_FEATURE_NUM_TYPE_ID MPR_TYPE_INT64
#define BLD_FEATURE_ROMFS 0
#define BLD_FEATURE_RUN_AS_SERVICE 0
diff --git a/source4/lib/appweb/mpr/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h
index bf57d50abc..58f47d256a 100644
--- a/source4/lib/appweb/mpr/miniMpr.h
+++ b/source4/lib/appweb/mpr/miniMpr.h
@@ -199,8 +199,8 @@ typedef unsigned char uchar;
#ifndef uint
#define uint unsigned
#endif
- __extension__ typedef long long int int64;
- __extension__ typedef unsigned long long int uint64;
+ typedef long long int int64;
+ typedef unsigned long long int uint64;
#endif
/*