aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog35
-rw-r--r--embed/mozilla/ContentHandler.cpp2
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp3
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp2
-rw-r--r--embed/mozilla/EphySingle.cpp2
-rw-r--r--embed/mozilla/EphyUtils.cpp7
-rw-r--r--embed/mozilla/EventContext.cpp2
-rw-r--r--embed/mozilla/FilePicker.cpp2
-rw-r--r--embed/mozilla/GlobalHistory.cpp2
-rw-r--r--embed/mozilla/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp2
-rw-r--r--embed/mozilla/Makefile.am3
-rw-r--r--embed/mozilla/MozDownload.cpp3
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp4
-rw-r--r--embed/mozilla/MozillaPrivate.cpp2
-rw-r--r--embed/mozilla/PrintingPromptService.cpp2
-rw-r--r--embed/mozilla/mozilla-download.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp3
25 files changed, 87 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2860fe744..4a10648b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2004-07-30 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/ContentHandler.cpp:
+ * embed/mozilla/EphyAboutRedirector.cpp:
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/EphyContentPolicy.cpp:
+ * embed/mozilla/EphyHeaderSniffer.cpp:
+ * embed/mozilla/EphySingle.cpp:
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EventContext.cpp:
+ * embed/mozilla/FilePicker.cpp:
+ * embed/mozilla/GlobalHistory.cpp:
+ * embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+ * embed/mozilla/Makefile.am:
+ * embed/mozilla/MozDownload.cpp:
+ * embed/mozilla/MozRegisterComponents.cpp:
+ * embed/mozilla/MozillaPrivate.cpp:
+ * embed/mozilla/PrintingPromptService.cpp:
+ * embed/mozilla/mozilla-download.cpp:
+ * embed/mozilla/mozilla-embed-event.cpp:
+ * embed/mozilla/mozilla-embed-persist.cpp:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * embed/mozilla/mozilla-embed.cpp:
+ * embed/mozilla/mozilla-notifiers.cpp:
+
+ Don't use -include which compilers other than gcc don't
+ understand. Instead include mozilla-config.h as first thing
+ in each file. Part of bug #143094.
+
+ * embed/mozilla/EphyUtils.cpp:
+
+ Also include config.h.
+
2004-07-29 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-toolbars-model.c: (parse_toolbars):
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 8f7555a66..5ec5e281c 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -21,6 +21,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index 3a5f49913..e07c069a2 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -39,6 +39,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 1cc78a29c..ecdd3c5f8 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -18,6 +18,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index a7200c3da..8654afe38 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -167,4 +169,3 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType,
return NS_OK;
}
#endif /* MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) */
-
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 470746d1a..955d8ed00 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -39,6 +39,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 065b886cf..7dc59b811 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index aae874091..9b271abaf 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -15,8 +15,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * $Id$
*/
+#include "mozilla-config.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "EphyUtils.h"
#include <nsIServiceManager.h>
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 2981e0789..82407e1b0 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -20,6 +20,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index c129a29d3..2223dafbe 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 4e44a409f..c92df3844 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index d2fb15fa4..d95988111 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -20,6 +20,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index b133ba057..2d49de941 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -26,6 +26,8 @@
* or expired certificate.
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 433f5a714..d84739cc9 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -35,6 +35,8 @@
*
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index bfa174bbe..89729f1f3 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -32,8 +32,7 @@ INCLUDES = \
-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
- -DALLOW_PRIVATE_API \
- -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
+ -DALLOW_PRIVATE_API
if MAINTAINER_MODE
INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index f1e6713f3..0d9e59a75 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -41,6 +41,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -720,4 +722,3 @@ nsresult BuildDownloadPath (const char *defaultFileName, nsILocalFile **_retval)
NS_IF_ADDREF (*_retval = destFile);
return NS_OK;
}
-
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index c3247e58a..fdb2ae96f 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -216,5 +218,3 @@ mozilla_register_components (void)
return ret;
}
-
-
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index 42e86932b..e3f3324f9 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -18,6 +18,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp
index 37ce2222b..3eb4886ec 100644
--- a/embed/mozilla/PrintingPromptService.cpp
+++ b/embed/mozilla/PrintingPromptService.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 06bf43290..3b66cbaf8 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -18,6 +18,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index 979554ca1..bca81e286 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index d5f2457b2..fff6b88e9 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -18,6 +18,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 37aa55b79..780f2ef37 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 6f5f84f7d..8f86a7a33 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -18,6 +18,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 474edc063..e49c1f86e 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -19,6 +19,8 @@
* $Id$
*/
+#include "mozilla-config.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -876,4 +878,3 @@ mozilla_proxy_ignore_notifier (GConfClient *client,
g_slist_foreach (hosts, (GFunc) g_free, NULL);
g_slist_free (hosts);
}
-