[Freeciv-Dev] (PR#12633) Add and rename header guards

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12633 >


I will apply this patch now. It makes tests/header_guard.sh happier.

        Raimar

-- 
 email: i-freeciv-lists@xxxxxxxxxxxxx
 "Just because you put a flag on the moon doesn't make it yours, it just
  puts a hole in the moon."

? __out__16923__
? diff
? files
? data/themes/morgan/1024x768
Index: client/gui-ftwl/gui_text.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-ftwl/gui_text.h,v
retrieving revision 1.3
diff -u -u -r1.3 gui_text.h
--- client/gui-ftwl/gui_text.h  25 Mar 2005 10:20:49 -0000      1.3
+++ client/gui-ftwl/gui_text.h  25 Mar 2005 11:18:25 -0000
@@ -11,6 +11,9 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
+#ifndef FC__GUI_TEXT_H
+#define FC__GUI_TEXT_H
+
 struct tile;
 struct unit;
 struct city;
@@ -28,3 +31,4 @@
 const char *mapview_get_unit_tooltip_text(struct unit *punit);
 const char *mapview_get_unit_info_text(struct unit *punit);
 
+#endif                         /* FC__GUI_TEXT_H */
Index: server/commands.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/commands.h,v
retrieving revision 1.4
diff -u -u -r1.4 commands.h
--- server/commands.h   25 Mar 2005 10:20:49 -0000      1.4
+++ server/commands.h   25 Mar 2005 11:18:32 -0000
@@ -11,6 +11,9 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
+#ifndef FC__COMMANDS_H
+#define FC__COMMANDS_H
+
 #include "connection.h"                /* for enum cmdlevel_id */
 
 /**************************************************************************
@@ -89,3 +92,5 @@
 };
 
 extern const struct command commands[];
+
+#endif                         /* FC__COMMANDS_H */
Index: server/settings.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/settings.h,v
retrieving revision 1.2
diff -u -u -r1.2 settings.h
--- server/settings.h   8 Oct 2004 16:30:13 -0000       1.2
+++ server/settings.h   25 Mar 2005 11:18:32 -0000
@@ -11,6 +11,9 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
+#ifndef FC__SETTINGS_H
+#define FC__SETTINGS_H
+
 #include "shared.h"
 
 #include "game.h"
@@ -122,3 +125,5 @@
 extern const int SETTINGS_NUM;
 
 bool sset_is_changeable(int idx);
+
+#endif                         /* FC__SETTINGS_H */
Index: server/generator/startpos.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/startpos.h,v
retrieving revision 1.2
diff -u -u -r1.2 startpos.h
--- server/generator/startpos.h 15 Oct 2004 09:39:06 -0000      1.2
+++ server/generator/startpos.h 25 Mar 2005 11:18:34 -0000
@@ -10,8 +10,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 ***********************************************************************/
-#ifndef FC__STARTING_POSITIONS
-#define FC__STARTING_POSITIONS
+#ifndef FC__STARTPOS_H
+#define FC__STARTPOS_H
 
 enum start_mode {
   MT_DEFAULT,
Index: utility/ftwl/back_end.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/ftwl/back_end.h,v
retrieving revision 1.4
diff -u -u -r1.4 back_end.h
--- utility/ftwl/back_end.h     22 Mar 2005 21:40:54 -0000      1.4
+++ utility/ftwl/back_end.h     25 Mar 2005 11:18:35 -0000
@@ -10,8 +10,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 ***********************************************************************/
-#ifndef __BE_H
-#define __BE_H
+#ifndef FC__BACK_END_H
+#define FC__BACK_END_H
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -153,4 +153,4 @@
 void be_write_osda_to_file(struct osda *osda, const char *filename);
 be_color be_get_color(int red, int green, int blue, int alpha);
 
-#endif
+#endif                         /* FC__BACK_END_H */
Index: utility/ftwl/text_renderer.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/ftwl/text_renderer.h,v
retrieving revision 1.3
diff -u -u -r1.3 text_renderer.h
--- utility/ftwl/text_renderer.h        25 Mar 2005 10:20:51 -0000      1.3
+++ utility/ftwl/text_renderer.h        25 Mar 2005 11:18:35 -0000
@@ -4,13 +4,16 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-                                                                               
                                              
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 ***********************************************************************/
 
+#ifndef FC__TEXT_RENDERER_H
+#define FC__TEXT_RENDERER_H
+
 #include "common_types.h"
 
 struct tr_string_data;
@@ -23,3 +26,5 @@
 void tr_string_get_size(struct ct_size *size, const struct ct_string *string);
 void tr_prepare_string(struct ct_string *string);
 void tr_free_string(struct ct_string *string);
+
+#endif                         /* FC__TEXT_RENDERER_H */