[Freeciv-Dev] (PR#10069) Patch: Include freeciv -specific headers as "header.h"

["Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10069 >


  This is required for #8164 to proceed.


  - Caz


diff -Nurd -X.diff_ignore freeciv/client/gui-gtk/resources.c 
freeciv/client/gui-gtk/resources.c
--- freeciv/client/gui-gtk/resources.c  2004-09-12 13:23:16.281250000 +0300
+++ freeciv/client/gui-gtk/resources.c  2004-09-12 18:55:03.984375000 +0300
@@ -22,5 +22,5 @@
 **************************************************************************/
 
 const gchar *fallback_resources =
-#include <Freeciv.h>
+#include "Freeciv.h"
 ;
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/resources.c 
freeciv/client/gui-gtk-2.0/resources.c
--- freeciv/client/gui-gtk-2.0/resources.c      2004-09-12 13:23:17.593750000 
+0300
+++ freeciv/client/gui-gtk-2.0/resources.c      2004-09-12 18:54:52.718750000 
+0300
@@ -22,5 +22,5 @@
 **************************************************************************/
 
 const gchar *fallback_resources =
-#include <Freeciv.h>
+#include "Freeciv.h"
 ;
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/resources.c 
freeciv/client/gui-sdl/resources.c
--- freeciv/client/gui-sdl/resources.c  2004-09-12 13:23:20.765625000 +0300
+++ freeciv/client/gui-sdl/resources.c  2004-09-12 18:55:46.281250000 +0300
@@ -21,6 +21,6 @@
 **************************************************************************/
 /*
 const gchar *fallback_resources =
-#include <Freeciv.h>
+#include "Freeciv.h"
 ;
 */
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/resources.c 
freeciv/client/gui-xaw/resources.c
--- freeciv/client/gui-xaw/resources.c  2004-09-12 13:23:25.890625000 +0300
+++ freeciv/client/gui-xaw/resources.c  2004-09-12 18:53:35.968750000 +0300
@@ -24,12 +24,6 @@
 Fallback resources
 **************************************************************************/
 String fallback_resources[] = {
-#include <Freeciv.h>
-  /* Deliberate use of angle-brackets instead of double quotes, to
-     support compilation from another dir.  Then we "-I." (see Makefile.am)
-     to include the locally generated Freeciv.h in the compilation dir,
-     in preference to the one in the source dir (which is what double-quote
-     include would use).  --dwp
-  */
+#include "Freeciv.h"
 NULL,
 };