From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 27 May 2005 07:30:24 +0000 (+0000)
Subject: r7009: the correct for maing it all build with my gcc-4.0
X-Git-Tag: samba-4.0.0alpha6~801^3~10884
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=1454d5a4cf2ed11b0c9e084340cf7519e2dd567e

r7009: the correct for maing it all build with my gcc-4.0

I assume the problem is caused by including a precompiled header twice...

metze
(This used to be commit 45f8b5dfa1d003666b551c95d4e3dce942c1a10e)
---

diff --git a/source4/web_server/ejs/miniMpr.h b/source4/web_server/ejs/miniMpr.h
index 447a0f4c34c..6fc9c02a16a 100644
--- a/source4/web_server/ejs/miniMpr.h
+++ b/source4/web_server/ejs/miniMpr.h
@@ -35,7 +35,9 @@
 /*
  *	Find out about our configuration
  */
-    #include	"includes.h"
+#ifndef _INCLUDES_H
+	#include	"includes.h"
+#endif
 
 /* allow this library to use strcpy() */
 #undef strcpy