summaryrefslogtreecommitdiff
path: root/source4/web_server/ejs
diff options
context:
space:
mode:
Diffstat (limited to 'source4/web_server/ejs')
-rw-r--r--source4/web_server/ejs/miniMpr.c2
-rw-r--r--source4/web_server/ejs/miniMpr.h10
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/web_server/ejs/miniMpr.c b/source4/web_server/ejs/miniMpr.c
index 8e1689ac9d..311f2defeb 100644
--- a/source4/web_server/ejs/miniMpr.c
+++ b/source4/web_server/ejs/miniMpr.c
@@ -35,7 +35,7 @@
#if !BLD_APPWEB
#if !BLD_GOAHEAD_WEBSERVER
-static TALLOC_CTX *mpr_ctx;
+static void *mpr_ctx;
void mprSetCtx(TALLOC_CTX *ctx)
{
diff --git a/source4/web_server/ejs/miniMpr.h b/source4/web_server/ejs/miniMpr.h
index b30ef1437f..447a0f4c34 100644
--- a/source4/web_server/ejs/miniMpr.h
+++ b/source4/web_server/ejs/miniMpr.h
@@ -35,10 +35,7 @@
/*
* Find out about our configuration
*/
-/*
- this is not needed in samba builds, and breaks the build with my gcc-4.0 --metze
- #include "includes.h"
-*/
+ #include "includes.h"
/* allow this library to use strcpy() */
#undef strcpy
@@ -195,7 +192,7 @@ typedef int bool;
typedef __int64 int64;
typedef unsigned __int64 uint64;
#else
- #define O_BINARY 0
+#define O_BINARY 0
#ifndef uint
#define uint unsigned
#endif
@@ -270,8 +267,7 @@ extern int mprReallocStrcat(char **dest, int max, int existingLen,
extern int mprStrcpy(char *dest, int destMax, const char *src);
extern int mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
-extern void mprFreeAll(void);
-extern void mprSetCtx(TALLOC_CTX *ctx);
+extern void mprSetCtx(void *ctx);
#ifdef __cplusplus
}