Add/rename header guards

This was SVN commit r7326.

source/lib/fat_time.h

@@ -20,5 +20,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef INCLUDED_FAT_TIME
+#define INCLUDED_FAT_TIME
+
 extern time_t time_t_from_FAT(u32 fat_timedate);
 extern u32 FAT_from_time_t(time_t time);
+
+#endif // INCLUDED_FAT_TIME

source/lib/file/archive/codec_zlib.h

@@ -20,8 +20,13 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef INCLUDED_CODEC_ZLIB
+#define INCLUDED_CODEC_ZLIB
+
 #include "codec.h"
 
 extern PICodec CreateCodec_ZLibNone();
 extern PICodec CreateCompressor_ZLibDeflate();
 extern PICodec CreateDecompressor_ZLibDeflate();
+
+#endif // INCLUDED_CODEC_ZLIB

source/lib/res/sound/ogghack.h

@@ -20,6 +20,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef INCLUDED_OGGHACK
+#define INCLUDED_OGGHACK
+
 void* ogg_create();
 
 void ogg_give_raw(void* o, void* p, size_t size);
@@ -29,3 +32,5 @@ void ogg_open(void* o, ALenum& fmt, ALsizei& freq);
 size_t ogg_read(void* o, void* buf, size_t max_size);
 
 void ogg_release(void* o);
+
+#endif // INCLUDED_OGGHACK

source/maths/Vector2D.h

@@ -20,8 +20,8 @@
  * scalar operations on it
  */
 
-#ifndef INCLUDED_VECTOR2D
-#define INCLUDED_VECTOR2D
+#ifndef INCLUDED_MATHS_VECTOR2D
+#define INCLUDED_MATHS_VECTOR2D
 
 
 #include <math.h>

source/ps/GameSetup/Atlas.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_ATLAS
+#define INCLUDED_ATLAS
+
 class CmdLineArgs;
 
 // free reference to Atlas UI SO (avoids resource leak report)
@@ -25,3 +28,5 @@ extern void ATLAS_Shutdown();
 // the editor button; it is much faster because it's called during early
 // init and therefore skips GUI setup.
 extern bool ATLAS_RunIfOnCmdLine(const CmdLineArgs& args);
+
+#endif // INCLUDED_ATLAS

source/ps/GameSetup/Config.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_PS_GAMESETUP_CONFIG
+#define INCLUDED_PS_GAMESETUP_CONFIG
+
 #include "ps/CStr.h"
 
 
@@ -73,3 +76,5 @@ extern void CONFIG_Init(const CmdLineArgs& args);
 extern bool g_ShowPathfindingOverlay;
 
 extern bool g_TriPathfind;
+
+#endif // INCLUDED_PS_GAMESETUP_CONFIG

source/ps/GameSetup/GameSetup.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_GAMESETUP
+#define INCLUDED_GAMESETUP
+
 //
 // GUI integration
 //
@@ -58,3 +61,5 @@ void RenderGui(bool RenderingState);
 class CmdLineArgs;
 extern void Init(const CmdLineArgs& args, int flags);
 extern void Shutdown(int flags);
+
+#endif // INCLUDED_GAMESETUP

source/ps/Globals.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_PS_GLOBALS
+#define INCLUDED_PS_GLOBALS
+
 #include "lib/input.h"
 #include "lib/frequency_filter.h"
 
@@ -54,3 +57,5 @@ extern bool g_mouse_buttons[6];
 extern InReaction GlobalsInputHandler(const SDL_Event_* ev);
 
 extern PIFrequencyFilter g_frequencyFilter;
+
+#endif // INCLUDED_PS_GLOBALS

source/ps/Hotkey.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef PS_HOTKEY_H
+#define PS_HOTKEY_H
+
 // Hotkey.h
 // 
 // Constant definitions and a couple of exports for the hotkey processor
@@ -155,3 +158,5 @@ extern bool HotkeyRespondsTo(int hotkey, int sdlkey);
 extern bool HotkeyIsPressed(const CStr& keyname);
 
 extern bool hotkeys[HOTKEY_LAST];
+
+#endif // PS_HOTKEY_H

source/ps/Interact.h

@@ -21,6 +21,9 @@
 // and the hotkey message processor.
 // Does this belong in GUI?
 
+#ifndef INCLUDED_INTERACT
+#define INCLUDED_INTERACT
+
 #include <vector>
 #include <map>
 
@@ -212,4 +215,4 @@ InReaction InteractInputHandler( const SDL_Event_* ev );
 #define g_Mouseover CMouseoverEntities::GetSingleton()
 #define g_BuildingPlacer CBuildingPlacer::GetSingleton()
 
-
+#endif // INCLUDED_INTERACT

source/ps/LoaderThunks.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_LOADERTHUNKS
+#define INCLUDED_LOADERTHUNKS
+
 // rationale for allocating MemFun_t dynamically:
 // need to store class pointer, function, and argument for each registered
 // function; single static storage isn't possible. we don't want to break
@@ -98,3 +101,5 @@ template<class T, class Arg> void RegMemFun1(T* this_, int(T::*func)(Arg), Arg a
 	void* param = new MemFun1_t<T, Arg>(this_, func, arg);
 	LDR_Register(MemFun1Thunk<T, Arg>, param, description, estimated_duration_ms);
 }
+
+#endif // INCLUDED_LOADERTHUNKS

source/ps/StringConvert.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_STRINGCONVERT
+#define INCLUDED_STRINGCONVERT
+
 typedef unsigned short jschar;
 typedef unsigned short ucs2char;
 
@@ -36,3 +39,5 @@ namespace StringConvert
 	void ucs2le_to_wstring(const char* start, const char* end, std::wstring& result);
 
 }
+
+#endif // INCLUDED_STRINGCONVERT

source/ps/Util.h

@@ -15,9 +15,14 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef PS_UTIL_H
+#define PS_UTIL_H
+
 extern void WriteSystemInfo();
 
 extern const wchar_t* ErrorString(int err);
 
 extern void WriteScreenshot(const std::wstring& extension);
 extern void WriteBigScreenshot(const std::wstring& extension, int tiles);
+
+#endif // PS_UTIL_H

source/ps/i18n.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_I18N
+#define INCLUDED_I18N
+
 #include "i18n/Interface.h"
 
 extern I18n::CLocale_interface* g_CurrentLocale;
@@ -27,3 +30,5 @@ namespace I18n
 	const char* CurrentLanguageName();
 	void Shutdown();
 }
+
+#endif // INCLUDED_I18N

source/sound/SoundGroupMgr.h

@@ -15,13 +15,10 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
-* =========================================================================
-* File        : SoundGroupMgr.h
-* Project     : 0 A.D.
-* Description : Manages and updates SoundGroups        
-* =========================================================================
-*/
+/** Manages and updates SoundGroups. */
+
+#ifndef INCLUDED_SOUNDGROUPMGR
+#define INCLUDED_SOUNDGROUPMGR
 
 #include "SoundGroup.h"
 #include <vector>
@@ -80,3 +77,5 @@ private:
 };
 
 #define g_soundGroupMgr CSoundGroupMgr::GetInstance()
+
+#endif // INCLUDED_SOUNDGROUPMGR

source/tools/atlas/GameInterface/Handlers/MessageHandler.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_MESSAGEHANDLER
+#define INCLUDED_MESSAGEHANDLER
+
 #include "../Messages.h"
 
 #include <map>
@@ -39,3 +42,5 @@ extern msgHandlers& GetMsgHandlers();
 #define QUERYHANDLER(t) THINGHANDLER(q, Query, t)
 
 }
+
+#endif // INCLUDED_MESSAGEHANDLER

source/tools/atlas/GameInterface/MessagePasserImpl.h

@@ -15,6 +15,9 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_MESSAGEPASSERIMPL
+#define INCLUDED_MESSAGEPASSERIMPL
+
 #include "MessagePasser.h"
 
 #include "ps/ThreadUtil.h"
@@ -42,3 +45,5 @@ private:
 	std::queue<AtlasMessage::IMessage*> m_Queue;
 	bool m_Trace;
 };
+
+#endif // INCLUDED_MESSAGEPASSERIMPL