diff --git a/sc2/src/abxadec/abxaud.h b/sc2/src/abxadec/abxaud.h index 9653a3704..e72ac07ed 100644 --- a/sc2/src/abxadec/abxaud.h +++ b/sc2/src/abxadec/abxaud.h @@ -18,8 +18,8 @@ * .abx speech track decoder */ -#ifndef _ABXAUD_H -#define _ABXAUD_H +#ifndef ABXADEC_ABXAUD_H_ +#define ABXADEC_ABXAUD_H_ typedef enum { @@ -31,4 +31,4 @@ typedef enum abxa_ErrOther = -1000, } abxa_Error; -#endif // _ABXAUD_H +#endif // ABXADEC_ABXAUD_H_ diff --git a/sc2/src/config_unix.h.in b/sc2/src/config_unix.h.in index 690bebf71..63d1e0a7e 100644 --- a/sc2/src/config_unix.h.in +++ b/sc2/src/config_unix.h.in @@ -7,8 +7,8 @@ * manually if you want anything else than the defaults. */ -#ifndef _CONFIG_UNIX_H -#define _CONFIG_UNIX_H +#ifndef CONFIG_UNIX_H_ +#define CONFIG_UNIX_H_ /* Directory where the UQM game data is located */ #define CONTENTDIR "@CONTENTDIR@" @@ -59,5 +59,5 @@ /* Defined if your system has _Bool of its own */ @HAVE__BOOL@ -#endif /* _CONFIG_UNIX_H */ +#endif /* CONFIG_UNIX_H_ */ diff --git a/sc2/src/config_vc6.h b/sc2/src/config_vc6.h index b7b97b110..d3ed0e3b8 100644 --- a/sc2/src/config_vc6.h +++ b/sc2/src/config_vc6.h @@ -7,8 +7,8 @@ * config_win.h is generated from src/config_win.h.in. */ -#ifndef _CONFIG_VC6_H -#define _CONFIG_VC6_H +#ifndef CONFIG_VC6_H_ +#define CONFIG_VC6_H_ /* Directory where the UQM game data is located */ #define CONTENTDIR "../content/" @@ -57,5 +57,5 @@ /* Defined if your system has wint_t of its own */ #define HAVE_WINT_T -#endif /* _CONFIG_VC6_H */ +#endif /* CONFIG_VC6_H_ */ diff --git a/sc2/src/config_win.h.in b/sc2/src/config_win.h.in index fcd50c39a..3001f1f0d 100644 --- a/sc2/src/config_win.h.in +++ b/sc2/src/config_win.h.in @@ -7,8 +7,8 @@ * from src/config_unix.h.in. */ -#ifndef _CONFIG_WIN_H -#define _CONFIG_WIN_H +#ifndef CONFIG_WIN_H_ +#define CONFIG_WIN_H_ /* Directory where the UQM game data is located */ #define CONTENTDIR "../content/" @@ -60,6 +60,6 @@ /* Defined if your system has _Bool of its own */ @HAVE__BOOL@ -#endif /* _CONFIG_WIN_H */ +#endif /* CONFIG_WIN_H_ */ diff --git a/sc2/src/endian_uqm.h b/sc2/src/endian_uqm.h index 76f64cd90..373849787 100644 --- a/sc2/src/endian_uqm.h +++ b/sc2/src/endian_uqm.h @@ -19,8 +19,8 @@ * Original copyright (C) Sam Lantinga */ -#ifndef _ENDIAN_UQM_H -#define _ENDIAN_UQM_H +#ifndef ENDIAN_UQM_H_ +#define ENDIAN_UQM_H_ #include "config.h" #include "types.h" diff --git a/sc2/src/libs/callback/alarm.h b/sc2/src/libs/callback/alarm.h index 54e0e7a2f..efb46b60d 100644 --- a/sc2/src/libs/callback/alarm.h +++ b/sc2/src/libs/callback/alarm.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _ALARM_H -#define _ALARM_H +#ifndef LIBS_CALLBACK_ALARM_H_ +#define LIBS_CALLBACK_ALARM_H_ #include "port.h" #include "types.h" @@ -50,5 +50,5 @@ void Alarm_remove(Alarm *alarm); void Alarm_process(void); Uint32 Alarm_timeBeforeNextMs(void); -#endif /* _ALARM_H */ +#endif /* LIBS_CALLBACK_ALARM_H_ */ diff --git a/sc2/src/libs/callback/callback.h b/sc2/src/libs/callback/callback.h index 2686cb6ac..f7f0d0b3e 100644 --- a/sc2/src/libs/callback/callback.h +++ b/sc2/src/libs/callback/callback.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CALLBACK_H -#define _CALLBACK_H +#ifndef LIBS_CALLBACK_CALLBACK_H_ +#define LIBS_CALLBACK_CALLBACK_H_ #include "types.h" @@ -37,5 +37,5 @@ CallbackID Callback_add(CallbackFunction callback, CallbackArg arg); bool Callback_remove(CallbackID id); void Callback_process(void); -#endif /* _CALLBACK_H */ +#endif /* LIBS_CALLBACK_CALLBACK_H_ */ diff --git a/sc2/src/libs/cdp/cdp.h b/sc2/src/libs/cdp/cdp.h index a8a7f5981..0390f07ab 100644 --- a/sc2/src/libs/cdp/cdp.h +++ b/sc2/src/libs/cdp/cdp.h @@ -19,8 +19,8 @@ * CDP library declarations */ -#ifndef _CDP_H -#define _CDP_H +#ifndef LIBS_CDP_CDP_H_ +#define LIBS_CDP_CDP_H_ #include "types.h" #include "cdpapi.h" @@ -44,4 +44,4 @@ const char* cdp_GetModuleComment (cdp_Module* module, bool bMetaString); int cdp_LoadAllModules (void); void cdp_FreeAllModules (void); -#endif /* _CDP_H */ +#endif /* LIBS_CDP_CDP_H_ */ diff --git a/sc2/src/libs/cdp/cdp_alli.h b/sc2/src/libs/cdp/cdp_alli.h index 38e48b3e2..31520e59d 100644 --- a/sc2/src/libs/cdp/cdp_alli.h +++ b/sc2/src/libs/cdp/cdp_alli.h @@ -19,8 +19,8 @@ * CDP All-interface list (for simplicity) */ -#ifndef _CDPALLI_H -#define _CDPALLI_H +#ifndef LIBS_CDP_CDP_ALLI_H_ +#define LIBS_CDP_CDP_ALLI_H_ #include "cdp_iio.h" #include "cdp_imem.h" @@ -28,4 +28,4 @@ #include "cdp_ivid.h" // TODO: add more cdp_iXXX.h here as they are defined -#endif /* _CDPALLI_H */ +#endif /* LIBS_CDP_CDP_ALLI_H_ */ diff --git a/sc2/src/libs/cdp/cdp_iio.h b/sc2/src/libs/cdp/cdp_iio.h index 1fd999577..19e6513a0 100644 --- a/sc2/src/libs/cdp/cdp_iio.h +++ b/sc2/src/libs/cdp/cdp_iio.h @@ -19,8 +19,8 @@ * CDP Unified IO Interface */ -#ifndef _CDPIIO_H -#define _CDPIIO_H +#ifndef LIBS_CDP_CDP_IIO_H_ +#define LIBS_CDP_CDP_IIO_H_ #include "types.h" #include "libs/uio.h" @@ -47,4 +47,4 @@ typedef struct typedef cdp_Itf_IoVtbl_v1 cdp_Itf_IoVtbl; typedef cdp_Itf_IoVtbl cdp_Itf_Io; -#endif /* _CDPIIO_H */ +#endif /* LIBS_CDP_CDP_IIO_H_ */ diff --git a/sc2/src/libs/cdp/cdp_imem.h b/sc2/src/libs/cdp/cdp_imem.h index f4c894814..7d1b59cf3 100644 --- a/sc2/src/libs/cdp/cdp_imem.h +++ b/sc2/src/libs/cdp/cdp_imem.h @@ -19,8 +19,8 @@ * CDP Memory Interface */ -#ifndef _CDPIMEM_H -#define _CDPIMEM_H +#ifndef LIBS_CDP_CDP_IMEM_H_ +#define LIBS_CDP_CDP_IMEM_H_ #include "types.h" #include "libs/memlib.h" @@ -39,4 +39,4 @@ typedef struct typedef cdp_Itf_MemoryVtbl_v1 cdp_Itf_MemoryVtbl; typedef cdp_Itf_MemoryVtbl cdp_Itf_Memory; -#endif /* _CDPIMEM_H */ +#endif /* LIBS_CDP_CDP_IMEM_H_ */ diff --git a/sc2/src/libs/cdp/cdp_isnd.h b/sc2/src/libs/cdp/cdp_isnd.h index af2b3b0b0..ae4aa9409 100644 --- a/sc2/src/libs/cdp/cdp_isnd.h +++ b/sc2/src/libs/cdp/cdp_isnd.h @@ -19,8 +19,8 @@ * CDP Sound Interface */ -#ifndef _CDPISND_H -#define _CDPISND_H +#ifndef LIBS_CDP_CDP_ISND_H_ +#define LIBS_CDP_CDP_ISND_H_ #include "types.h" #include "libs/sound/sound.h" @@ -40,4 +40,4 @@ typedef struct typedef cdp_Itf_SoundVtbl_v1 cdp_Itf_SoundVtbl; typedef cdp_Itf_SoundVtbl cdp_Itf_Sound; -#endif /* _CDPISND_H */ +#endif /* LIBS_CDP_CDP_ISND_H_ */ diff --git a/sc2/src/libs/cdp/cdp_ivid.h b/sc2/src/libs/cdp/cdp_ivid.h index ed4d3ad9b..a9fc0b21f 100644 --- a/sc2/src/libs/cdp/cdp_ivid.h +++ b/sc2/src/libs/cdp/cdp_ivid.h @@ -19,8 +19,8 @@ * CDP Video Interface */ -#ifndef _CDPIVID_H -#define _CDPIVID_H +#ifndef LIBS_CDP_CDP_IVID_H_ +#define LIBS_CDP_CDP_IVID_H_ #include "types.h" #include "libs/video/video.h" @@ -40,4 +40,4 @@ typedef struct typedef cdp_Itf_VideoVtbl_v1 cdp_Itf_VideoVtbl; typedef cdp_Itf_VideoVtbl cdp_Itf_Video; -#endif /* _CDPIVID_H */ +#endif /* LIBS_CDP_CDP_IVID_H_ */ diff --git a/sc2/src/libs/cdp/cdpapi.h b/sc2/src/libs/cdp/cdpapi.h index e0641e4b5..e1a0e0b8e 100644 --- a/sc2/src/libs/cdp/cdpapi.h +++ b/sc2/src/libs/cdp/cdpapi.h @@ -20,8 +20,8 @@ * the API is used by both the engine and modules */ -#ifndef _CDPAPI_H -#define _CDPAPI_H +#ifndef LIBS_CDP_CDPAPI_H_ +#define LIBS_CDP_CDPAPI_H_ #include "types.h" @@ -151,4 +151,4 @@ typedef struct typedef cdp_Itf_HostVtbl_v1 cdp_Itf_HostVtbl; typedef cdp_Itf_HostVtbl cdp_Itf_Host; -#endif /* _CDPAPI_H */ +#endif /* LIBS_CDP_CDPAPI_H_ */ diff --git a/sc2/src/libs/cdp/cdpint.h b/sc2/src/libs/cdp/cdpint.h index 9616af9e8..fbc3238c4 100644 --- a/sc2/src/libs/cdp/cdpint.h +++ b/sc2/src/libs/cdp/cdpint.h @@ -19,8 +19,8 @@ * CDP common internal definitions */ -#ifndef _CDPINT_H -#define _CDPINT_H +#ifndef LIBS_CDP_CDPINT_H_ +#define LIBS_CDP_CDPINT_H_ #include "cdpapi.h" #include "cdp_imem.h" diff --git a/sc2/src/libs/cdp/cdpmod.h b/sc2/src/libs/cdp/cdpmod.h index 756666f53..a1fdcae34 100644 --- a/sc2/src/libs/cdp/cdpmod.h +++ b/sc2/src/libs/cdp/cdpmod.h @@ -20,8 +20,8 @@ * all CDP modules should #include this .h */ -#ifndef _CDPMOD_H -#define _CDPMOD_H +#ifndef LIBS_CDP_CDPMOD_H_ +#define LIBS_CDP_CDPMOD_H_ #include "types.h" #include "cdpapi.h" @@ -89,4 +89,4 @@ typedef struct # define CDPEXPORT #endif -#endif /* _CDPMOD_H */ +#endif /* LIBS_CDP_CDPMOD_H_ */ diff --git a/sc2/src/libs/cdp/windl.h b/sc2/src/libs/cdp/windl.h index c095ca84a..71ca24024 100644 --- a/sc2/src/libs/cdp/windl.h +++ b/sc2/src/libs/cdp/windl.h @@ -19,8 +19,8 @@ * CDP dlopen() & Co. WIN32 implementation */ -#ifndef _WINDL_H -#define _WINDL_H +#ifndef LIBS_CDP_WINDL_H_ +#define LIBS_CDP_WINDL_H_ #include "types.h" @@ -34,4 +34,4 @@ extern char *dlerror (void); #define RTLD_NOW 2 /* immediate function call binding */ #define RTLD_GLOBAL 4 /* symbols in this dlopen'ed obj are visible to other dlopen'ed objs */ -#endif /* _WINDL_H */ +#endif /* LIBS_CDP_WINDL_H_ */ diff --git a/sc2/src/libs/cdplib.h b/sc2/src/libs/cdplib.h index 51405fea3..524d6e6be 100644 --- a/sc2/src/libs/cdplib.h +++ b/sc2/src/libs/cdplib.h @@ -16,9 +16,9 @@ * */ -#ifndef _CDPLIB_H -#define _CDPLIB_H +#ifndef LIBS_CDPLIB_H_ +#define LIBS_CDPLIB_H_ #include "cdp/cdp.h" -#endif /* _CDPLIB_H */ +#endif /* LIBS_CDPLIB_H_ */ diff --git a/sc2/src/libs/compiler.h b/sc2/src/libs/compiler.h index 0b2970928..954a2d997 100644 --- a/sc2/src/libs/compiler.h +++ b/sc2/src/libs/compiler.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COMPILER_H -#define _COMPILER_H +#ifndef LIBS_COMPILER_H_ +#define LIBS_COMPILER_H_ #include "types.h" @@ -85,5 +85,5 @@ typedef DWORD (*PDWORDFUNC) (void); # define _ALIGNED_ON(bytes) #endif -#endif /* _COMPILER_H */ +#endif /* LIBS_COMPILER_H_ */ diff --git a/sc2/src/libs/declib.h b/sc2/src/libs/declib.h index dc2f922a5..62fc3ec02 100644 --- a/sc2/src/libs/declib.h +++ b/sc2/src/libs/declib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _DECLIB_H -#define _DECLIB_H +#ifndef LIBS_DECLIB_H_ +#define LIBS_DECLIB_H_ #include "libs/compiler.h" typedef struct _LZHCODE_DESC* DECODE_REF; @@ -45,4 +45,4 @@ extern COUNT cread (void *pStr, COUNT size, COUNT count, extern COUNT cwrite (const void *pStr, COUNT size, COUNT count, DECODE_REF DecodeRef); -#endif /* _DECLIB_H */ +#endif /* LIBS_DECLIB_H_ */ diff --git a/sc2/src/libs/decomp/lzh.h b/sc2/src/libs/decomp/lzh.h index 62a0977b0..8ebdef4c9 100644 --- a/sc2/src/libs/decomp/lzh.h +++ b/sc2/src/libs/decomp/lzh.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LZH_H -#define _LZH_H +#ifndef LIBS_DECOMP_LZH_H_ +#define LIBS_DECOMP_LZH_H_ #include "libs/declib.h" #include "libs/memlib.h" @@ -87,5 +87,5 @@ extern BYTE* _Stream; extern UWORD _workbuf; extern BYTE _workbuflen; -#endif /* _LZH_H */ +#endif /* LIBS_DECOMP_LZH_H_ */ diff --git a/sc2/src/libs/file.h b/sc2/src/libs/file.h index 83c06dbf4..225b0ca9a 100644 --- a/sc2/src/libs/file.h +++ b/sc2/src/libs/file.h @@ -16,8 +16,8 @@ // Contains file handling code -#ifndef _FILE_H -#define _FILE_H +#ifndef LIBS_FILE_H_ +#define LIBS_FILE_H_ #include "port.h" #include "libs/uio.h" @@ -83,5 +83,5 @@ static inline int isDriveLetter(int c) } #endif /* HAVE_DRIVE_LETTERS */ -#endif /* _FILE_H */ +#endif /* LIBS_FILE_H_ */ diff --git a/sc2/src/libs/gfxlib.h b/sc2/src/libs/gfxlib.h index 346030357..c109d66d0 100644 --- a/sc2/src/libs/gfxlib.h +++ b/sc2/src/libs/gfxlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GFXLIB_H -#define _GFXLIB_H +#ifndef LIBS_GFXLIB_H_ +#define LIBS_GFXLIB_H_ #include "port.h" #include "libs/compiler.h" @@ -454,4 +454,4 @@ extern COLORMAPPTR GetColorMapAddress (COLORMAP); void SetSystemRect (const RECT *pRect); void ClearSystemRect (void); -#endif /* _GFXLIB_H */ +#endif /* LIBS_GFXLIB_H_ */ diff --git a/sc2/src/libs/graphics/context.h b/sc2/src/libs/graphics/context.h index ff759087b..09b50cf1b 100644 --- a/sc2/src/libs/graphics/context.h +++ b/sc2/src/libs/graphics/context.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CONTEXT_H -#define _CONTEXT_H +#ifndef LIBS_GRAPHICS_CONTEXT_H_ +#define LIBS_GRAPHICS_CONTEXT_H_ #include "tfb_draw.h" #include "libs/memlib.h" @@ -143,5 +143,5 @@ extern GRAPHICS_STATUS _GraphicsStatusFlags; BOOLEAN GetContextValidRect (RECT *pValidRect, POINT *origin); extern void FixContextFontEffect (void); -#endif /* _CONTEXT_H */ +#endif /* LIBS_GRAPHICS_CONTEXT_H_ */ diff --git a/sc2/src/libs/graphics/drawable.h b/sc2/src/libs/graphics/drawable.h index baebb0e12..98f5adab4 100644 --- a/sc2/src/libs/graphics/drawable.h +++ b/sc2/src/libs/graphics/drawable.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _DRAWABLE_H -#define _DRAWABLE_H +#ifndef LIBS_GRAPHICS_DRAWABLE_H_ +#define LIBS_GRAPHICS_DRAWABLE_H_ #include #include "tfb_draw.h" @@ -84,5 +84,5 @@ extern FRAME _CurFramePtr; // ClipRect is relative to ctxOrigin extern void _text_blt (RECT *pClipRect, TEXT *TextPtr, POINT ctxOrigin); -#endif /* _DRAWABLE_H */ +#endif /* LIBS_GRAPHICS_DRAWABLE_H_ */ diff --git a/sc2/src/libs/graphics/font.h b/sc2/src/libs/graphics/font.h index 1d3828a9f..b6bd13bfa 100644 --- a/sc2/src/libs/graphics/font.h +++ b/sc2/src/libs/graphics/font.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _FONT_H -#define _FONT_H +#ifndef LIBS_GRAPHICS_FONT_H_ +#define LIBS_GRAPHICS_FONT_H_ #include "libs/memlib.h" @@ -67,5 +67,5 @@ extern FONT _CurFontPtr; extern void *_GetFontData (uio_Stream *fp, DWORD length); extern BOOLEAN _ReleaseFontData (void *handle); -#endif /* _FONT_H */ +#endif /* LIBS_GRAPHICS_FONT_H_ */ diff --git a/sc2/src/libs/graphics/gfxintrn.h b/sc2/src/libs/graphics/gfxintrn.h index c34f6142c..72281e655 100644 --- a/sc2/src/libs/graphics/gfxintrn.h +++ b/sc2/src/libs/graphics/gfxintrn.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GFXINTRN_H -#define _GFXINTRN_H +#ifndef LIBS_GRAPHICS_GFXINTRN_H_ +#define LIBS_GRAPHICS_GFXINTRN_H_ #include #include @@ -28,5 +28,5 @@ #include "drawable.h" #include "font.h" -#endif /* _GFXINTRN_H */ +#endif /* LIBS_GRAPHICS_GFXINTRN_H_ */ diff --git a/sc2/src/libs/graphics/prim.h b/sc2/src/libs/graphics/prim.h index db27b69c4..bce3c2a75 100644 --- a/sc2/src/libs/graphics/prim.h +++ b/sc2/src/libs/graphics/prim.h @@ -13,8 +13,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PRIM_H -#define _PRIM_H +#ifndef LIBS_GRAPHICS_PRIM_H_ +#define LIBS_GRAPHICS_PRIM_H_ enum gfx_object { diff --git a/sc2/src/libs/graphics/sdl/2xscalers.h b/sc2/src/libs/graphics/sdl/2xscalers.h index 4066366ec..f004fcd7b 100644 --- a/sc2/src/libs/graphics/sdl/2xscalers.h +++ b/sc2/src/libs/graphics/sdl/2xscalers.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _2XSCALERS_H_ -#define _2XSCALERS_H_ +#ifndef LIBS_GRAPHICS_SDL_2XSCALERS_H_ +#define LIBS_GRAPHICS_SDL_2XSCALERS_H_ void Scale_Nearest (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r); void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r); @@ -27,4 +27,4 @@ void Scale_HqFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r); extern const Scale_FuncDef_t Scale_C_Functions[]; -#endif /* _2XSCALERS_H_ */ +#endif /* LIBS_GRAPHICS_SDL_2XSCALERS_H_ */ diff --git a/sc2/src/libs/graphics/sdl/2xscalers_mmx.h b/sc2/src/libs/graphics/sdl/2xscalers_mmx.h index 022bcd475..c8dba320b 100644 --- a/sc2/src/libs/graphics/sdl/2xscalers_mmx.h +++ b/sc2/src/libs/graphics/sdl/2xscalers_mmx.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _2XSCALERS_MMX_H_ -#define _2XSCALERS_MMX_H_ +#ifndef LIBS_GRAPHICS_SDL_2XSCALERS_MMX_H_ +#define LIBS_GRAPHICS_SDL_2XSCALERS_MMX_H_ // MMX versions void Scale_MMX_PrepPlatform (const SDL_PixelFormat* fmt); @@ -53,4 +53,4 @@ void Scale_3DNow_HqFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r); extern const Scale_FuncDef_t Scale_3DNow_Functions[]; -#endif /* _2XSCALERS_MMX_H_ */ +#endif /* LIBS_GRAPHICS_SDL_2XSCALERS_MMX_H_ */ diff --git a/sc2/src/libs/graphics/sdl/opengl.h b/sc2/src/libs/graphics/sdl/opengl.h index f5094462b..2b57349c7 100644 --- a/sc2/src/libs/graphics/sdl/opengl.h +++ b/sc2/src/libs/graphics/sdl/opengl.h @@ -70,9 +70,9 @@ void TFB_GL_UploadTransitionScreen (void); #endif /* This is from Win32's */ -#ifndef _WCHAR_T_DEFINED +#ifndef LIBS_GRAPHICS_SDL_OPENGL_H_ typedef unsigned short wchar_t; -#define _WCHAR_T_DEFINED +#define LIBS_GRAPHICS_SDL_OPENGL_H_ #endif #include "GL/glu.h" diff --git a/sc2/src/libs/graphics/sdl/sdluio.h b/sc2/src/libs/graphics/sdl/sdluio.h index f415f2374..86d76fc2c 100644 --- a/sc2/src/libs/graphics/sdl/sdluio.h +++ b/sc2/src/libs/graphics/sdl/sdluio.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SDLUIO_H -#define _SDLUIO_H +#ifndef LIBS_GRAPHICS_SDL_SDLUIO_H_ +#define LIBS_GRAPHICS_SDL_SDLUIO_H_ #include "port.h" #include "libs/uio.h" @@ -29,5 +29,5 @@ int sdluio_write (SDL_RWops *context, const void *ptr, int size, int num); int sdluio_close (SDL_RWops *context); -#endif /* _SDLUIO_H */ +#endif /* LIBS_GRAPHICS_SDL_SDLUIO_H_ */ diff --git a/sc2/src/libs/graphics/widgets.h b/sc2/src/libs/graphics/widgets.h index 40859d46d..4548e3575 100644 --- a/sc2/src/libs/graphics/widgets.h +++ b/sc2/src/libs/graphics/widgets.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _WIDGETS_H -#define _WIDGETS_H +#ifndef LIBS_GRAPHICS_WIDGETS_H_ +#define LIBS_GRAPHICS_WIDGETS_H_ #include "libs/gfxlib.h" @@ -219,4 +219,4 @@ void Widget_Slider_DrawValue (WIDGET_SLIDER *self, int x, int y); /* Other implementations will need these values */ extern WIDGET *widget_focus; -#endif /* _WIDGETS_H */ +#endif /* LIBS_GRAPHICS_WIDGETS_H_ */ diff --git a/sc2/src/libs/heap/heap.h b/sc2/src/libs/heap/heap.h index 9b3efbf6a..9a3f82971 100644 --- a/sc2/src/libs/heap/heap.h +++ b/sc2/src/libs/heap/heap.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _HEAP_H -#define _HEAP_H +#ifndef LIBS_HEAP_HEAP_H_ +#define LIBS_HEAP_HEAP_H_ #include "types.h" @@ -65,5 +65,5 @@ size_t Heap_count(const Heap *heap); bool Heap_hasMore(const Heap *heap); void Heap_remove(Heap *heap, HeapValue *value); -#endif /* _HEAP_H */ +#endif /* LIBS_HEAP_HEAP_H_ */ diff --git a/sc2/src/libs/inplib.h b/sc2/src/libs/inplib.h index 08bb0d1a2..c7fe2e172 100644 --- a/sc2/src/libs/inplib.h +++ b/sc2/src/libs/inplib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _INPLIB_H -#define _INPLIB_H +#ifndef LIBS_INPLIB_H_ +#define LIBS_INPLIB_H_ #include #include "libs/compiler.h" @@ -59,5 +59,5 @@ void SaveKeyConfiguration (uio_DirHandle *path, const char *fname); void BeginInputFrame (void); -#endif /* _INPLIB_H */ +#endif /* LIBS_INPLIB_H_ */ diff --git a/sc2/src/libs/input/inpintrn.h b/sc2/src/libs/input/inpintrn.h index 064f654c5..1d48ccc6d 100644 --- a/sc2/src/libs/input/inpintrn.h +++ b/sc2/src/libs/input/inpintrn.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _INPINTRN_H -#define _INPINTRN_H +#ifndef LIBS_INPUT_INPINTRN_H_ +#define LIBS_INPUT_INPINTRN_H_ #include "libs/inplib.h" #include "libs/input/input_common.h" -#endif /* _INPINTRN_H */ +#endif /* LIBS_INPUT_INPINTRN_H_ */ diff --git a/sc2/src/libs/input/sdl/keynames.h b/sc2/src/libs/input/sdl/keynames.h index 22f954a9a..e9879101e 100644 --- a/sc2/src/libs/input/sdl/keynames.h +++ b/sc2/src/libs/input/sdl/keynames.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _KEYNAMES_H_ -#define _KEYNAMES_H_ +#ifndef LIBS_INPUT_SDL_KEYNAMES_H_ +#define LIBS_INPUT_SDL_KEYNAMES_H_ char *VControl_code2name (int code); int VControl_name2code (char *code); diff --git a/sc2/src/libs/input/sdl/vcontrol.h b/sc2/src/libs/input/sdl/vcontrol.h index bff70a213..cc3b4652e 100644 --- a/sc2/src/libs/input/sdl/vcontrol.h +++ b/sc2/src/libs/input/sdl/vcontrol.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _VCONTROL_H_ -#define _VCONTROL_H_ +#ifndef LIBS_INPUT_SDL_VCONTROL_H_ +#define LIBS_INPUT_SDL_VCONTROL_H_ #include "port.h" #include SDL_INCLUDE(SDL.h) diff --git a/sc2/src/libs/math/mthintrn.h b/sc2/src/libs/math/mthintrn.h index fbf9e801d..cfda76708 100644 --- a/sc2/src/libs/math/mthintrn.h +++ b/sc2/src/libs/math/mthintrn.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MTHINTRN_H -#define _MTHINTRN_H +#ifndef LIBS_MATH_MTHINTRN_H_ +#define LIBS_MATH_MTHINTRN_H_ #include "libs/mathlib.h" -#endif /* _MTHINTRN_H */ +#endif /* LIBS_MATH_MTHINTRN_H_ */ diff --git a/sc2/src/libs/math/random.h b/sc2/src/libs/math/random.h index fd982e195..f8b0b8c9e 100644 --- a/sc2/src/libs/math/random.h +++ b/sc2/src/libs/math/random.h @@ -26,8 +26,8 @@ * Copyright (c) 1989, Robert Leyland and Scott Anderson ****************************************************************************/ -#ifndef _RANDOM_H -#define _RANDOM_H +#ifndef LIBS_MATH_RANDOM_H_ +#define LIBS_MATH_RANDOM_H_ /* ----------------------------DEFINES------------------------------------ */ @@ -57,6 +57,6 @@ DWORD RandomContext_Random (RandomContext *context); DWORD RandomContext_SeedRandom (RandomContext *context, DWORD new_seed); -#endif /* _RANDOM_H */ +#endif /* LIBS_MATH_RANDOM_H_ */ diff --git a/sc2/src/libs/mathlib.h b/sc2/src/libs/mathlib.h index fca48fdd4..f5654b986 100644 --- a/sc2/src/libs/mathlib.h +++ b/sc2/src/libs/mathlib.h @@ -16,14 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MATHLIB_H -#define _MATHLIB_H +#ifndef LIBS_MATHLIB_H_ +#define LIBS_MATHLIB_H_ #include "libs/compiler.h" #include "math/random.h" extern COUNT square_root (DWORD value); -#endif /* _MATHLIB_H */ +#endif /* LIBS_MATHLIB_H_ */ diff --git a/sc2/src/libs/md5.h b/sc2/src/libs/md5.h index 3f24cc9b5..1526b9dcd 100644 --- a/sc2/src/libs/md5.h +++ b/sc2/src/libs/md5.h @@ -16,10 +16,10 @@ * */ -#ifndef _LIB_MD5_H -#define _LIB_MD5_H +#ifndef LIBS_MD5_H_ +#define LIBS_MD5_H_ #include "md5/md5.h" -#endif /* _LIB_MD5_H */ +#endif /* LIBS_MD5_H_ */ diff --git a/sc2/src/libs/md5/md5.h b/sc2/src/libs/md5/md5.h index b9994780b..063952586 100644 --- a/sc2/src/libs/md5/md5.h +++ b/sc2/src/libs/md5/md5.h @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _MD5_H -#define _MD5_H 1 +#ifndef LIBS_MD5_MD5_H_ +#define LIBS_MD5_MD5_H_ 1 #include diff --git a/sc2/src/libs/memlib.h b/sc2/src/libs/memlib.h index 291b62429..f68fc0895 100644 --- a/sc2/src/libs/memlib.h +++ b/sc2/src/libs/memlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MEMLIB_H -#define _MEMLIB_H +#ifndef LIBS_MEMLIB_H_ +#define LIBS_MEMLIB_H_ #include "types.h" @@ -29,5 +29,5 @@ extern void HFree (void *p); extern void *HCalloc (int size); extern void *HRealloc (void *p, int size); -#endif /* _MEMLIB_H */ +#endif /* LIBS_MEMLIB_H_ */ diff --git a/sc2/src/libs/mikmod/mikmod.h b/sc2/src/libs/mikmod/mikmod.h index 436a02475..1fd5322de 100644 --- a/sc2/src/libs/mikmod/mikmod.h +++ b/sc2/src/libs/mikmod/mikmod.h @@ -26,8 +26,8 @@ ==============================================================================*/ -#ifndef _MIKMOD_H_ -#define _MIKMOD_H_ +#ifndef LIBS_MIKMOD_MIKMOD_H_ +#define LIBS_MIKMOD_MIKMOD_H_ #include #include diff --git a/sc2/src/libs/mikmod/mikmod_internals.h b/sc2/src/libs/mikmod/mikmod_internals.h index b24d999ba..f84c4b714 100644 --- a/sc2/src/libs/mikmod/mikmod_internals.h +++ b/sc2/src/libs/mikmod/mikmod_internals.h @@ -26,8 +26,8 @@ ==============================================================================*/ -#ifndef _MIKMOD_INTERNALS_H -#define _MIKMOD_INTERNALS_H +#ifndef LIBS_MIKMOD_MIKMOD_INTERNALS_H_ +#define LIBS_MIKMOD_MIKMOD_INTERNALS_H_ #ifdef __cplusplus extern "C" { diff --git a/sc2/src/libs/net.h b/sc2/src/libs/net.h index 50ce7e1bd..f41c5b93e 100644 --- a/sc2/src/libs/net.h +++ b/sc2/src/libs/net.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NET_H -#define _NET_H +#ifndef LIBS_NET_H_ +#define LIBS_NET_H_ #include "network/network.h" #include "network/netmanager/netmanager.h" @@ -25,5 +25,5 @@ #include "network/connect/listen.h" #include "network/connect/resolve.h" -#endif /* _NET_H */ +#endif /* LIBS_NET_H_ */ diff --git a/sc2/src/libs/network/bytesex.h b/sc2/src/libs/network/bytesex.h index 99b644db7..4ee89d757 100644 --- a/sc2/src/libs/network/bytesex.h +++ b/sc2/src/libs/network/bytesex.h @@ -22,8 +22,8 @@ // functions are in winsock2.h, which includes windows.h, which includes // pretty much Microsoft's complete collection of .h files. -#ifndef _BYTESEX_H -#define _BYTESEX_H +#ifndef LIBS_NETWORK_BYTESEX_H_ +#define LIBS_NETWORK_BYTESEX_H_ #include "port.h" // for inline @@ -92,5 +92,5 @@ ntoh32(uint32 x) { #endif /* defined(WORDS_BIGENDIAN) */ -#endif /* _BYTESEX_H */ +#endif /* LIBS_NETWORK_BYTESEX_H_ */ diff --git a/sc2/src/libs/network/connect/connect.h b/sc2/src/libs/network/connect/connect.h index 95343cb09..77d7a444e 100644 --- a/sc2/src/libs/network/connect/connect.h +++ b/sc2/src/libs/network/connect/connect.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CONNECT_CONNECT_H -#define _CONNECT_CONNECT_H +#ifndef LIBS_NETWORK_CONNECT_CONNECT_H_ +#define LIBS_NETWORK_CONNECT_CONNECT_H_ typedef struct ConnectFlags ConnectFlags; @@ -106,6 +106,6 @@ void ConnectState_close(ConnectState *connectState); void ConnectState_setExtra(ConnectState *connectState, void *extra); void *ConnectState_getExtra(ConnectState *connectState); -#endif /* _CONNECT_CONNECT_H */ +#endif /* LIBS_NETWORK_CONNECT_CONNECT_H_ */ diff --git a/sc2/src/libs/network/connect/listen.h b/sc2/src/libs/network/connect/listen.h index d9ef85399..e44ef53d3 100644 --- a/sc2/src/libs/network/connect/listen.h +++ b/sc2/src/libs/network/connect/listen.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CONNECT_LISTEN_H -#define _CONNECT_LISTEN_H +#ifndef LIBS_NETWORK_CONNECT_LISTEN_H_ +#define LIBS_NETWORK_CONNECT_LISTEN_H_ typedef struct ListenFlags ListenFlags; typedef enum { @@ -102,5 +102,5 @@ bool ListenState_decRef(ListenState *listenState); void ListenState_setExtra(ListenState *listenState, void *extra); void *ListenState_getExtra(ListenState *listenState); -#endif /* _CONNECT_LISTEN_H */ +#endif /* LIBS_NETWORK_CONNECT_LISTEN_H_ */ diff --git a/sc2/src/libs/network/connect/resolve.h b/sc2/src/libs/network/connect/resolve.h index 92bb91c94..509c3b9d5 100644 --- a/sc2/src/libs/network/connect/resolve.h +++ b/sc2/src/libs/network/connect/resolve.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CONNECT_RESOLVE_H -#define _CONNECT_RESOLVE_H +#ifndef LIBS_NETWORK_CONNECT_RESOLVE_H_ +#define LIBS_NETWORK_CONNECT_RESOLVE_H_ typedef struct ResolveFlags ResolveFlags; @@ -105,5 +105,5 @@ void splitAddrInfoOnFamily(struct addrinfo *info, int family, struct addrinfo **rest, struct addrinfo ***restEnd); -#endif /* _CONNECT_RESOLVE_H */ +#endif /* LIBS_NETWORK_CONNECT_RESOLVE_H_ */ diff --git a/sc2/src/libs/network/netmanager/ndesc.h b/sc2/src/libs/network/netmanager/ndesc.h index 630532629..8834db9f8 100644 --- a/sc2/src/libs/network/netmanager/ndesc.h +++ b/sc2/src/libs/network/netmanager/ndesc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NDESC_H -#define _NDESC_H +#ifndef LIBS_NETWORK_NETMANAGER_NDESC_H_ +#define LIBS_NETWORK_NETMANAGER_NDESC_H_ #include "types.h" @@ -77,6 +77,6 @@ void NetDescriptor_setCloseCallback(NetDescriptor *nd, NetDescriptor_CloseCallback callback); -#endif /* _NDESC_H */ +#endif /* LIBS_NETWORK_NETMANAGER_NDESC_H_ */ diff --git a/sc2/src/libs/network/netmanager/netmanager.h b/sc2/src/libs/network/netmanager/netmanager.h index a3213686c..42be5723f 100644 --- a/sc2/src/libs/network/netmanager/netmanager.h +++ b/sc2/src/libs/network/netmanager/netmanager.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETMANAGER_H -#define _NETMANAGER_H +#ifndef LIBS_NETWORK_NETMANAGER_NETMANAGER_H_ +#define LIBS_NETWORK_NETMANAGER_NETMANAGER_H_ #include "port.h" #include "types.h" @@ -44,5 +44,5 @@ void NetManager_deactivateWriteCallback(NetDescriptor *nd); void NetManager_activateExceptionCallback(NetDescriptor *nd); void NetManager_deactivateExceptionCallback(NetDescriptor *nd); -#endif /* _NETMANAGER_H */ +#endif /* LIBS_NETWORK_NETMANAGER_NETMANAGER_H_ */ diff --git a/sc2/src/libs/network/netmanager/netmanager_bsd.h b/sc2/src/libs/network/netmanager/netmanager_bsd.h index 27a51bfbd..b94dd6966 100644 --- a/sc2/src/libs/network/netmanager/netmanager_bsd.h +++ b/sc2/src/libs/network/netmanager/netmanager_bsd.h @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETMANAGER_BSD_H -#define _NETMANAGER_BSD_H +#ifndef LIBS_NETWORK_NETMANAGER_NETMANAGER_BSD_H_ +#define LIBS_NETWORK_NETMANAGER_NETMANAGER_BSD_H_ typedef struct SocketManagementDataBsd SocketManagementDataBsd; typedef SocketManagementDataBsd SocketManagementData; -#endif /* _NETMANAGER_BSD_H */ +#endif /* LIBS_NETWORK_NETMANAGER_NETMANAGER_BSD_H_ */ diff --git a/sc2/src/libs/network/netmanager/netmanager_win.h b/sc2/src/libs/network/netmanager/netmanager_win.h index 64edbc7da..03d65e4d4 100644 --- a/sc2/src/libs/network/netmanager/netmanager_win.h +++ b/sc2/src/libs/network/netmanager/netmanager_win.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETMANAGER_WIN_H -#define _NETMANAGER_WIN_H +#ifndef LIBS_NETWORK_NETMANAGER_NETMANAGER_WIN_H_ +#define LIBS_NETWORK_NETMANAGER_NETMANAGER_WIN_H_ typedef struct SocketManagementDataWin SocketManagementDataWin; typedef SocketManagementDataWin SocketManagementData; @@ -30,6 +30,6 @@ struct SocketManagementDataWin { #endif /* NETMANAGER_INTERNAL */ -#endif /* _NETMANAGER_WIN_H */ +#endif /* LIBS_NETWORK_NETMANAGER_NETMANAGER_WIN_H_ */ diff --git a/sc2/src/libs/network/netport.h b/sc2/src/libs/network/netport.h index a158c3bef..ee9969936 100644 --- a/sc2/src/libs/network/netport.h +++ b/sc2/src/libs/network/netport.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETPORT_H -#define _NETPORT_H +#ifndef LIBS_NETWORK_NETPORT_H_ +#define LIBS_NETWORK_NETPORT_H_ #include "port.h" @@ -38,6 +38,6 @@ gai_strerror(int err) { #endif -#endif /* _NETPORT_H */ +#endif /* LIBS_NETWORK_NETPORT_H_ */ diff --git a/sc2/src/libs/network/network.h b/sc2/src/libs/network/network.h index e183199ce..d8c596e8f 100644 --- a/sc2/src/libs/network/network.h +++ b/sc2/src/libs/network/network.h @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETWORK_H -#define _NETWORK_H +#ifndef LIBS_NETWORK_NETWORK_H_ +#define LIBS_NETWORK_NETWORK_H_ void Network_init(void); void Network_uninit(void); -#endif /* _NETWORK_H */ +#endif /* LIBS_NETWORK_NETWORK_H_ */ diff --git a/sc2/src/libs/network/socket/socket.h b/sc2/src/libs/network/socket/socket.h index 707d3191a..45631858f 100644 --- a/sc2/src/libs/network/socket/socket.h +++ b/sc2/src/libs/network/socket/socket.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _UQM_SOCKET_H -#define _UQM_SOCKET_H +#ifndef LIBS_NETWORK_SOCKET_SOCKET_H_ +#define LIBS_NETWORK_SOCKET_SOCKET_H_ typedef struct Socket Socket; #define Socket_noSocket ((Socket *) NULL) @@ -91,5 +91,5 @@ int Socket_setInlineOOB(Socket *sock); int Socket_setKeepAlive(Socket *sock); int Socket_getError(Socket *sock, int *err); -#endif /* _UQM_SOCKET_H */ +#endif /* LIBS_NETWORK_SOCKET_SOCKET_H_ */ diff --git a/sc2/src/libs/network/socket/socket_bsd.h b/sc2/src/libs/network/socket/socket_bsd.h index 149cdd6c0..8019c0157 100644 --- a/sc2/src/libs/network/socket/socket_bsd.h +++ b/sc2/src/libs/network/socket/socket_bsd.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SOCKET_BSD_H -#define _SOCKET_BSD_H +#ifndef LIBS_NETWORK_SOCKET_SOCKET_BSD_H_ +#define LIBS_NETWORK_SOCKET_SOCKET_BSD_H_ #include "types.h" #include @@ -29,5 +29,5 @@ struct Socket { #endif /* SOCKET_INTERNAL */ -#endif /* _SOCKET_BSD_H */ +#endif /* LIBS_NETWORK_SOCKET_SOCKET_BSD_H_ */ diff --git a/sc2/src/libs/network/socket/socket_win.h b/sc2/src/libs/network/socket/socket_win.h index 9e1e3e2da..ed1674c37 100644 --- a/sc2/src/libs/network/socket/socket_win.h +++ b/sc2/src/libs/network/socket/socket_win.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SOCKET_WIN_H -#define _SOCKET_WIN_H +#ifndef LIBS_NETWORK_SOCKET_SOCKET_WIN_H_ +#define LIBS_NETWORK_SOCKET_SOCKET_WIN_H_ #ifdef SOCKET_INTERNAL #include @@ -29,6 +29,6 @@ struct Socket { typedef int socklen_t; struct sockaddr; -#endif /* _SOCKET_WIN_H */ +#endif /* LIBS_NETWORK_SOCKET_SOCKET_WIN_H_ */ diff --git a/sc2/src/libs/network/wspiapiwrap.h b/sc2/src/libs/network/wspiapiwrap.h index c60d63cea..23361a453 100644 --- a/sc2/src/libs/network/wspiapiwrap.h +++ b/sc2/src/libs/network/wspiapiwrap.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _WSPIAPIWRAP_H -#define _WSPIAPIWRAP_H +#ifndef LIBS_NETWORK_WSPIAPIWRAP_H_ +#define LIBS_NETWORK_WSPIAPIWRAP_H_ // HACK. See wspiapiwrap.c # define getaddrinfo WspiapiGetAddrInfo @@ -29,5 +29,5 @@ int WINAPI WspiapiGetAddrInfo(const char *nodename, const char *servname, int WINAPI WspiapiGetNameInfo (const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags); -#endif /* _WSPIAPIWRAP_H */ +#endif /* LIBS_NETWORK_WSPIAPIWRAP_H_ */ diff --git a/sc2/src/libs/reslib.h b/sc2/src/libs/reslib.h index c7486e8d0..616248a9f 100644 --- a/sc2/src/libs/reslib.h +++ b/sc2/src/libs/reslib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _RESLIB_H -#define _RESLIB_H +#ifndef LIBS_RESLIB_H_ +#define LIBS_RESLIB_H_ //#include #include "libs/compiler.h" @@ -120,4 +120,4 @@ void res_PutColor (const char *key, Color value); BOOLEAN res_Remove (const char *key); -#endif /* _RESLIB_H */ +#endif /* LIBS_RESLIB_H_ */ diff --git a/sc2/src/libs/resource/index.h b/sc2/src/libs/resource/index.h index f563c0a01..72b6be0b5 100644 --- a/sc2/src/libs/resource/index.h +++ b/sc2/src/libs/resource/index.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _INDEX_H -#define _INDEX_H +#ifndef LIBS_RESOURCE_INDEX_H_ +#define LIBS_RESOURCE_INDEX_H_ #include #include "libs/reslib.h" @@ -47,5 +47,5 @@ struct resource_index_desc size_t numRes; }; -#endif /* _INDEX_H */ +#endif /* LIBS_RESOURCE_INDEX_H_ */ diff --git a/sc2/src/libs/resource/resintrn.h b/sc2/src/libs/resource/resintrn.h index 35ddb2c3b..e2255ea57 100644 --- a/sc2/src/libs/resource/resintrn.h +++ b/sc2/src/libs/resource/resintrn.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _RESINTRN_H -#define _RESINTRN_H +#ifndef LIBS_RESOURCE_RESINTRN_H_ +#define LIBS_RESOURCE_RESINTRN_H_ #include #include "libs/reslib.h" @@ -30,5 +30,5 @@ void _set_current_index_header (RESOURCE_INDEX newResourceIndex); RESOURCE_INDEX _get_current_index_header (void); -#endif /* _RESINTRN_H */ +#endif /* LIBS_RESOURCE_RESINTRN_H_ */ diff --git a/sc2/src/libs/resource/stringbank.h b/sc2/src/libs/resource/stringbank.h index c60a86724..e77105b32 100644 --- a/sc2/src/libs/resource/stringbank.h +++ b/sc2/src/libs/resource/stringbank.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STRINGBANK_H_ -#define _STRINGBANK_H_ +#ifndef LIBS_RESOURCE_STRINGBANK_H_ +#define LIBS_RESOURCE_STRINGBANK_H_ #ifdef SB_DEBUG #include @@ -54,4 +54,4 @@ int SplitString (const char *s, char splitchar, int n, const char **result, stri void StringBank_Dump (stringbank *bank, FILE *s); #endif /* SB_DEBUG */ -#endif /* _STRINGBANK_H_ */ +#endif /* LIBS_RESOURCE_STRINGBANK_H_ */ diff --git a/sc2/src/libs/sndlib.h b/sc2/src/libs/sndlib.h index cc8c38895..e64b56103 100644 --- a/sc2/src/libs/sndlib.h +++ b/sc2/src/libs/sndlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SNDLIB_H -#define _SNDLIB_H +#ifndef LIBS_SNDLIB_H_ +#define LIBS_SNDLIB_H_ #include "port.h" #include "libs/strlib.h" @@ -95,5 +95,5 @@ extern void WaitForSoundEnd (COUNT Channel); extern DWORD FadeMusic (BYTE end_vol, SIZE TimeInterval); -#endif /* _SNDLIB_H */ +#endif /* LIBS_SNDLIB_H_ */ diff --git a/sc2/src/libs/sound/audiocore.h b/sc2/src/libs/sound/audiocore.h index 48c8b940f..6f48b26df 100644 --- a/sc2/src/libs/sound/audiocore.h +++ b/sc2/src/libs/sound/audiocore.h @@ -17,8 +17,8 @@ /* Audio Core API (derived from OpenAL) */ -#ifndef _AUDIOCORE_H -#define _AUDIOCORE_H +#ifndef LIBS_SOUND_AUDIOCORE_H_ +#define LIBS_SOUND_AUDIOCORE_H_ #include "config.h" #include "types.h" @@ -166,4 +166,4 @@ void audio_BufferData (audio_Object bufobj, uint32 format, void* data, bool audio_GetFormatInfo (uint32 format, int *channels, int *sample_size); -#endif /* _AUDIOCORE_H */ +#endif /* LIBS_SOUND_AUDIOCORE_H_ */ diff --git a/sc2/src/libs/sound/mixer/mixer.h b/sc2/src/libs/sound/mixer/mixer.h index 087299f16..71e787805 100644 --- a/sc2/src/libs/sound/mixer/mixer.h +++ b/sc2/src/libs/sound/mixer/mixer.h @@ -17,8 +17,8 @@ /* Mixer for low-level sound output drivers */ -#ifndef _MIXER_H -#define _MIXER_H +#ifndef LIBS_SOUND_MIXER_MIXER_H_ +#define LIBS_SOUND_MIXER_MIXER_H_ #include "config.h" #include "types.h" @@ -271,4 +271,4 @@ MIX_COMPILE_TIME_ASSERT (mixer_IntVal, #undef MIX_COMPILE_TIME_ASSERT -#endif /* _MIXER_H */ +#endif /* LIBS_SOUND_MIXER_MIXER_H_ */ diff --git a/sc2/src/libs/sound/mixer/mixerint.h b/sc2/src/libs/sound/mixer/mixerint.h index 17c9281c1..060516184 100644 --- a/sc2/src/libs/sound/mixer/mixerint.h +++ b/sc2/src/libs/sound/mixer/mixerint.h @@ -18,8 +18,8 @@ * Internals */ -#ifndef _MIXERINT_H -#define _MIXERINT_H +#ifndef LIBS_SOUND_MIXER_MIXERINT_H_ +#define LIBS_SOUND_MIXER_MIXERINT_H_ #include "port.h" #include "types.h" @@ -107,4 +107,4 @@ static inline bool mixer_SourceGetFakeSample (mixer_Source *src, float *psamp, bool left); static inline uint32 mixer_SourceAdvance (mixer_Source *src, bool left); -#endif /* _MIXERINT_H */ +#endif /* LIBS_SOUND_MIXER_MIXERINT_H_ */ diff --git a/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h index 2f06d6044..173b706ce 100644 --- a/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h +++ b/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h @@ -17,8 +17,8 @@ /* Nosound audio driver */ -#ifndef _AUDIODRV_NOSOUND_H -#define _AUDIODRV_NOSOUND_H +#ifndef LIBS_SOUND_MIXER_NOSOUND_AUDIODRV_NOSOUND_H_ +#define LIBS_SOUND_MIXER_NOSOUND_AUDIODRV_NOSOUND_H_ #include "config.h" #include "libs/sound/sound.h" @@ -66,4 +66,4 @@ void noSound_BufferData (audio_Object bufobj, uint32 format, void* data, uint32 size, uint32 freq); -#endif /* _AUDIODRV_NOSOUND_H */ +#endif /* LIBS_SOUND_MIXER_NOSOUND_AUDIODRV_NOSOUND_H_ */ diff --git a/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h index a9cb490f4..d74301b07 100644 --- a/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h +++ b/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h @@ -17,8 +17,8 @@ /* SDL audio driver */ -#ifndef _AUDIODRV_SDL_H -#define _AUDIODRV_SDL_H +#ifndef LIBS_SOUND_MIXER_SDL_AUDIODRV_SDL_H_ +#define LIBS_SOUND_MIXER_SDL_AUDIODRV_SDL_H_ #include "port.h" #include "libs/sound/sound.h" @@ -63,4 +63,4 @@ void mixSDL_BufferData (audio_Object bufobj, uint32 format, void* data, uint32 size, uint32 freq); -#endif /* _AUDIODRV_SDL_H */ +#endif /* LIBS_SOUND_MIXER_SDL_AUDIODRV_SDL_H_ */ diff --git a/sc2/src/libs/sound/openal/audiodrv_openal.h b/sc2/src/libs/sound/openal/audiodrv_openal.h index 1635eb276..df359f1e6 100644 --- a/sc2/src/libs/sound/openal/audiodrv_openal.h +++ b/sc2/src/libs/sound/openal/audiodrv_openal.h @@ -17,8 +17,8 @@ /* OpenAL audio driver */ -#ifndef _AUDIODRV_OPENAL_H -#define _AUDIODRV_OPENAL_H +#ifndef LIBS_SOUND_OPENAL_AUDIODRV_OPENAL_H_ +#define LIBS_SOUND_OPENAL_AUDIODRV_OPENAL_H_ #include "config.h" #include "libs/sound/sound.h" @@ -84,4 +84,4 @@ void openAL_BufferData (audio_Object bufobj, uint32 format, void* data, uint32 size, uint32 freq); -#endif /* _AUDIODRV_OPENAL_H */ +#endif /* LIBS_SOUND_OPENAL_AUDIODRV_OPENAL_H_ */ diff --git a/sc2/src/libs/sound/sndintrn.h b/sc2/src/libs/sound/sndintrn.h index feb12318e..2340c4d24 100644 --- a/sc2/src/libs/sound/sndintrn.h +++ b/sc2/src/libs/sound/sndintrn.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SNDINTRN_H -#define _SNDINTRN_H +#ifndef LIBS_SOUND_SNDINTRN_H_ +#define LIBS_SOUND_SNDINTRN_H_ #include #include "types.h" @@ -73,4 +73,4 @@ typedef struct tfb_soundsource extern TFB_SoundSource soundSource[]; -#endif /* _SNDINTRN_H */ +#endif /* LIBS_SOUND_SNDINTRN_H_ */ diff --git a/sc2/src/libs/sound/sound.h b/sc2/src/libs/sound/sound.h index 311f43037..5e55fe309 100644 --- a/sc2/src/libs/sound/sound.h +++ b/sc2/src/libs/sound/sound.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UQM_SOUND_H // try avoiding collisions on id -#define _UQM_SOUND_H +#ifndef LIBS_SOUND_SOUND_H_ // try avoiding collisions on id +#define LIBS_SOUND_SOUND_H_ #include "types.h" #include "audiocore.h" @@ -78,4 +78,4 @@ bool TFB_TagBuffer (TFB_SoundSample*, audio_Object buffer, intptr_t data); #include "stream.h" -#endif // _UQM_SOUND_H +#endif // LIBS_SOUND_SOUND_H_ diff --git a/sc2/src/libs/strings/strintrn.h b/sc2/src/libs/strings/strintrn.h index 11cf0ed69..24484f0e8 100644 --- a/sc2/src/libs/strings/strintrn.h +++ b/sc2/src/libs/strings/strintrn.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STRINTRN_H -#define _STRINTRN_H +#ifndef LIBS_STRINGS_STRINTRN_H_ +#define LIBS_STRINGS_STRINTRN_H_ #include #include @@ -49,5 +49,5 @@ void *_GetStringData (uio_Stream *fp, DWORD length); void *_GetBinaryTableData (uio_Stream *fp, DWORD length); void _GetConversationData (const char *path, RESOURCE_DATA *resdata); -#endif /* _STRINTRN_H */ +#endif /* LIBS_STRINGS_STRINTRN_H_ */ diff --git a/sc2/src/libs/strlib.h b/sc2/src/libs/strlib.h index 7f4ba0245..59a290f32 100644 --- a/sc2/src/libs/strlib.h +++ b/sc2/src/libs/strlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STRLIB_H -#define _STRLIB_H +#ifndef LIBS_STRLIB_H_ +#define LIBS_STRLIB_H_ #include "libs/compiler.h" #include "port.h" @@ -67,5 +67,5 @@ extern STRINGPTR GetStringTimeStamp (STRING String); #define UNICHAR_BULLET 0x2022 #define STR_BULLET "\xE2\x80\xA2" -#endif /* _STRLIB_H */ +#endif /* LIBS_STRLIB_H_ */ diff --git a/sc2/src/libs/tasklib.h b/sc2/src/libs/tasklib.h index fea7510cf..b086b05ac 100644 --- a/sc2/src/libs/tasklib.h +++ b/sc2/src/libs/tasklib.h @@ -21,8 +21,8 @@ * processes. They are built on top of threads, but add the ability to * modify a "state" variable to pass messages back and forth. */ -#ifndef _TASKLIB_H -#define _TASKLIB_H +#ifndef LIBS_TASKLIB_H_ +#define LIBS_TASKLIB_H_ #include "libs/threadlib.h" diff --git a/sc2/src/libs/threadlib.h b/sc2/src/libs/threadlib.h index fe9070e91..a5cf9f31e 100644 --- a/sc2/src/libs/threadlib.h +++ b/sc2/src/libs/threadlib.h @@ -17,8 +17,8 @@ /* By Serge van den Boom, 2002-09-12 */ -#ifndef _THREADLIB_H -#define _THREADLIB_H +#ifndef LIBS_THREADLIB_H_ +#define LIBS_THREADLIB_H_ #define NAMED_SYNCHRO /* Should synchronizable objects have names? */ #define TRACK_CONTENTION /* Should we report when a thread sleeps on synchronize? */ @@ -173,5 +173,5 @@ void WaitCondVar (CondVar); void SignalCondVar (CondVar); void BroadcastCondVar (CondVar); -#endif /* _THREADLIB_H */ +#endif /* LIBS_THREADLIB_H_ */ diff --git a/sc2/src/libs/threads/pthread/posixthreads.h b/sc2/src/libs/threads/pthread/posixthreads.h index a2e22b14c..9945b53e1 100644 --- a/sc2/src/libs/threads/pthread/posixthreads.h +++ b/sc2/src/libs/threads/pthread/posixthreads.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UQMPTHREADS_H -#define _UQMPTHREADS_H +#ifndef LIBS_THREADS_PTHREAD_POSIXTHREADS_H_ +#define LIBS_THREADS_PTHREAD_POSIXTHREADS_H_ #include "port.h" #include "libs/threadlib.h" diff --git a/sc2/src/libs/threads/sdl/sdlthreads.h b/sc2/src/libs/threads/sdl/sdlthreads.h index eae6f5949..c93c94737 100644 --- a/sc2/src/libs/threads/sdl/sdlthreads.h +++ b/sc2/src/libs/threads/sdl/sdlthreads.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SDLTHREAD_H -#define _SDLTHREAD_H +#ifndef LIBS_THREADS_SDL_SDLTHREADS_H_ +#define LIBS_THREADS_SDL_SDLTHREADS_H_ #include "port.h" #include SDL_INCLUDE(SDL.h) @@ -102,5 +102,5 @@ int GetRecursiveMutexDepth_SDL (RecursiveMutex m); #define NativeUnlockRecursiveMutex UnlockRecursiveMutex_SDL #define NativeGetRecursiveMutexDepth GetRecursiveMutexDepth_SDL -#endif /* _SDLTHREAD_H */ +#endif /* LIBS_THREADS_SDL_SDLTHREADS_H_ */ diff --git a/sc2/src/libs/threads/thrcommon.h b/sc2/src/libs/threads/thrcommon.h index cad03df44..d6d6d41ac 100644 --- a/sc2/src/libs/threads/thrcommon.h +++ b/sc2/src/libs/threads/thrcommon.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _THRCOMMON_H -#define _THRCOMMON_H +#ifndef LIBS_THREADS_THRCOMMON_H_ +#define LIBS_THREADS_THRCOMMON_H_ #if defined(THREADLIB_SDL) diff --git a/sc2/src/libs/time/sdl/sdltime.h b/sc2/src/libs/time/sdl/sdltime.h index 2e498aabe..ee72dc913 100644 --- a/sc2/src/libs/time/sdl/sdltime.h +++ b/sc2/src/libs/time/sdl/sdltime.h @@ -17,8 +17,8 @@ /* By Serge van den Boom, 2002-09-12 */ -#ifndef _SDLTIME_H -#define _SDLTIME_H +#ifndef LIBS_TIME_SDL_SDLTIME_H_ +#define LIBS_TIME_SDL_SDLTIME_H_ #include "port.h" #include SDL_INCLUDE(SDL.h) @@ -31,5 +31,5 @@ extern Uint32 SDLWrapper_GetTimeCounter (void); SDLWrapper_GetTimeCounter () -#endif /* _SDLTIME_H */ +#endif /* LIBS_TIME_SDL_SDLTIME_H_ */ diff --git a/sc2/src/libs/time/timecommon.h b/sc2/src/libs/time/timecommon.h index b443b830a..ec5892c20 100644 --- a/sc2/src/libs/time/timecommon.h +++ b/sc2/src/libs/time/timecommon.h @@ -17,8 +17,8 @@ /* By Serge van den Boom, 2002-09-12 */ -#ifndef _TIMECOMMON_H -#define _TIMECOMMON_H +#ifndef LIBS_TIME_TIMECOMMON_H_ +#define LIBS_TIME_TIMECOMMON_H_ #if TIMELIB == SDL @@ -26,5 +26,5 @@ #endif /* TIMELIB == SDL */ -#endif /* _TIMECOMMON_H */ +#endif /* LIBS_TIME_TIMECOMMON_H_ */ diff --git a/sc2/src/libs/timelib.h b/sc2/src/libs/timelib.h index c48b2fe6c..b069c8d36 100644 --- a/sc2/src/libs/timelib.h +++ b/sc2/src/libs/timelib.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _TIMLIB_H -#define _TIMLIB_H +#ifndef LIBS_TIMELIB_H_ +#define LIBS_TIMELIB_H_ #define TIMELIB SDL @@ -38,5 +38,5 @@ extern void InitTimeSystem (void); extern void UnInitTimeSystem (void); extern TimeCount GetTimeCounter (void); -#endif /* _TIMLIB_H */ +#endif /* LIBS_TIMELIB_H_ */ diff --git a/sc2/src/libs/uio.h b/sc2/src/libs/uio.h index 15acfc467..16ad7a929 100644 --- a/sc2/src/libs/uio.h +++ b/sc2/src/libs/uio.h @@ -18,10 +18,10 @@ * */ -#ifndef _UIO_H -#define _UIO_H +#ifndef LIBS_UIO_H_ +#define LIBS_UIO_H_ #include "uio/io.h" -#endif /* _UIO_H */ +#endif /* LIBS_UIO_H_ */ diff --git a/sc2/src/libs/uio/charhashtable.h b/sc2/src/libs/uio/charhashtable.h index b30a021b5..6c387c105 100644 --- a/sc2/src/libs/uio/charhashtable.h +++ b/sc2/src/libs/uio/charhashtable.h @@ -18,8 +18,8 @@ * */ -#ifndef _CHARHASHTABLE_H -#define _CHARHASHTABLE_H +#ifndef LIBS_UIO_CHARHASHTABLE_H_ +#define LIBS_UIO_CHARHASHTABLE_H_ #define HASHTABLE_(identifier) CharHashTable ## _ ## identifier diff --git a/sc2/src/libs/uio/fileblock.h b/sc2/src/libs/uio/fileblock.h index c6dc83627..97a81e180 100644 --- a/sc2/src/libs/uio/fileblock.h +++ b/sc2/src/libs/uio/fileblock.h @@ -18,8 +18,8 @@ * */ -#ifndef _FILEBLOCK_H -#define _FILEBLOCK_H +#ifndef LIBS_UIO_FILEBLOCK_H_ +#define LIBS_UIO_FILEBLOCK_H_ typedef struct uio_FileBlock uio_FileBlock; @@ -83,6 +83,6 @@ void uio_setFileBlockUsageHint(uio_FileBlock *block, int usage, size_t readAheadBufSize); void uio_clearFileBlockBuffers(uio_FileBlock *block); -#endif /* _FILEBLOCK_H */ +#endif /* LIBS_UIO_FILEBLOCK_H_ */ diff --git a/sc2/src/libs/uio/fstypes.h b/sc2/src/libs/uio/fstypes.h index 3b6883a50..3ff01a2c4 100644 --- a/sc2/src/libs/uio/fstypes.h +++ b/sc2/src/libs/uio/fstypes.h @@ -18,8 +18,8 @@ * */ -#ifndef _FSTYPES_H -#define _FSTYPES_H +#ifndef LIBS_UIO_FSTYPES_H_ +#define LIBS_UIO_FSTYPES_H_ typedef int uio_FileSystemID; #define uio_FSTYPE_STDIO 1 @@ -109,5 +109,5 @@ uio_FileSystemInfo *uio_getFileSystemInfo(uio_FileSystemID id); #endif /* uio_INTERNAL */ -#endif /* _FSTYPES_H */ +#endif /* LIBS_UIO_FSTYPES_H_ */ diff --git a/sc2/src/libs/uio/getint.h b/sc2/src/libs/uio/getint.h index 5759f0e98..ad6e81091 100644 --- a/sc2/src/libs/uio/getint.h +++ b/sc2/src/libs/uio/getint.h @@ -18,8 +18,8 @@ * */ -#ifndef _GETINT_H -#define _GETINT_H +#ifndef LIBS_UIO_GETINT_H_ +#define LIBS_UIO_GETINT_H_ /* All these functions return true on success, or false on failure */ @@ -137,5 +137,5 @@ uio_getS32BE(uio_Stream *stream, uio_sint32 *result) { } -#endif /* _GETINT_H */ +#endif /* LIBS_UIO_GETINT_H_ */ diff --git a/sc2/src/libs/uio/gphys.h b/sc2/src/libs/uio/gphys.h index e256b97bf..627f71b0c 100644 --- a/sc2/src/libs/uio/gphys.h +++ b/sc2/src/libs/uio/gphys.h @@ -18,8 +18,8 @@ * */ -#ifndef _GPHYS_H -#define _GPHYS_H +#ifndef LIBS_UIO_GPHYS_H_ +#define LIBS_UIO_GPHYS_H_ #include "uioport.h" @@ -309,5 +309,5 @@ uio_GPFile_unref(uio_GPFile *gPFile) { } -#endif /* _GPHYS_H */ +#endif /* LIBS_UIO_GPHYS_H_ */ diff --git a/sc2/src/libs/uio/io.h b/sc2/src/libs/uio/io.h index 8e8ce663c..e98baca35 100644 --- a/sc2/src/libs/uio/io.h +++ b/sc2/src/libs/uio/io.h @@ -18,8 +18,8 @@ * */ -#ifndef _IO_H -#define _IO_H +#ifndef LIBS_UIO_IO_H_ +#define LIBS_UIO_IO_H_ #include #include @@ -149,5 +149,5 @@ void uio_DirHandle_print(const uio_DirHandle *dirHandle, FILE *out); # define uio_DEBUG #endif -#endif /* _IO_H */ +#endif /* LIBS_UIO_IO_H_ */ diff --git a/sc2/src/libs/uio/ioaux.h b/sc2/src/libs/uio/ioaux.h index c4dab8b5f..41c7e3966 100644 --- a/sc2/src/libs/uio/ioaux.h +++ b/sc2/src/libs/uio/ioaux.h @@ -18,8 +18,8 @@ * */ -#ifndef _IOAUX_H -#define _IOAUX_H +#ifndef LIBS_UIO_IOAUX_H_ +#define LIBS_UIO_IOAUX_H_ #include "iointrn.h" #include "physical.h" @@ -49,5 +49,5 @@ ssize_t uio_resolvePath(uio_DirHandle *dirHandle, const char *path, size_t pathLen, char **destPath); -#endif /* _IOAUX_H */ +#endif /* LIBS_UIO_IOAUX_H_ */ diff --git a/sc2/src/libs/uio/iointrn.h b/sc2/src/libs/uio/iointrn.h index 141b449fa..522ce1832 100644 --- a/sc2/src/libs/uio/iointrn.h +++ b/sc2/src/libs/uio/iointrn.h @@ -18,8 +18,8 @@ * */ -#ifndef _IOINTERN_H -#define _IOINTERN_H +#ifndef LIBS_UIO_IOINTRN_H_ +#define LIBS_UIO_IOINTRN_H_ #define uio_INTERNAL @@ -192,6 +192,6 @@ uio_PFileHandle_unref(uio_PFileHandle *handle) { } -#endif /* _IOINTERN_H */ +#endif /* LIBS_UIO_IOINTRN_H_ */ diff --git a/sc2/src/libs/uio/match.h b/sc2/src/libs/uio/match.h index 1e20bcc33..9faf5887f 100644 --- a/sc2/src/libs/uio/match.h +++ b/sc2/src/libs/uio/match.h @@ -18,8 +18,8 @@ * */ -#ifndef _MATCH_H -#define _MATCH_H +#ifndef LIBS_UIO_MATCH_H_ +#define LIBS_UIO_MATCH_H_ typedef struct match_MatchContext match_MatchContext; @@ -178,5 +178,5 @@ void match_freeRegex(match_RegexContext *context); #endif /* match_INTERNAL */ -#endif /* _MATCH_H */ +#endif /* LIBS_UIO_MATCH_H_ */ diff --git a/sc2/src/libs/uio/mem.h b/sc2/src/libs/uio/mem.h index 2ec279125..915837e0e 100644 --- a/sc2/src/libs/uio/mem.h +++ b/sc2/src/libs/uio/mem.h @@ -18,8 +18,8 @@ * */ -#ifndef _MEM_H -#define _MEM_H +#ifndef LIBS_UIO_MEM_H_ +#define LIBS_UIO_MEM_H_ #include #include diff --git a/sc2/src/libs/uio/memdebug.h b/sc2/src/libs/uio/memdebug.h index 3862801c2..e04a8d21a 100644 --- a/sc2/src/libs/uio/memdebug.h +++ b/sc2/src/libs/uio/memdebug.h @@ -18,8 +18,8 @@ * */ -#ifndef _MEMDEBUG_H -#define _MEMDEBUG_H +#ifndef LIBS_UIO_MEMDEBUG_H_ +#define LIBS_UIO_MEMDEBUG_H_ #include #include "uioport.h" @@ -93,5 +93,5 @@ void uio_MemDebug_printPointers(FILE *out); #define uio_MemDebug_debugUnref(type, pointer) \ uio_MemDebug_logUnref(uio_MemDebug_LogType_ ## type, pointer) -#endif /* _MEMDEBUG_H */ +#endif /* LIBS_UIO_MEMDEBUG_H_ */ diff --git a/sc2/src/libs/uio/mount.h b/sc2/src/libs/uio/mount.h index 90b638d64..237f54bf8 100644 --- a/sc2/src/libs/uio/mount.h +++ b/sc2/src/libs/uio/mount.h @@ -18,8 +18,8 @@ * */ -#ifndef _MOUNT_H -#define _MOUNT_H +#ifndef LIBS_UIO_MOUNT_H_ +#define LIBS_UIO_MOUNT_H_ typedef struct uio_Repository uio_Repository; @@ -60,5 +60,5 @@ void uio_repositoryRemoveMount(uio_Repository *repository, #endif /* uio_INTERNAL */ -#endif /* _MOUNT_H */ +#endif /* LIBS_UIO_MOUNT_H_ */ diff --git a/sc2/src/libs/uio/mounttree.h b/sc2/src/libs/uio/mounttree.h index a99295be8..b0041bcef 100644 --- a/sc2/src/libs/uio/mounttree.h +++ b/sc2/src/libs/uio/mounttree.h @@ -18,8 +18,8 @@ * */ -#ifndef _MOUNTTREE_H -#define _MOUNTTREE_H +#ifndef LIBS_UIO_MOUNTTREE_H_ +#define LIBS_UIO_MOUNTTREE_H_ #include #include "mount.h" @@ -200,5 +200,5 @@ uio_mountInfoIsReadOnly(uio_MountInfo *mountInfo) { #endif /* uio_INTERNAL */ -#endif /* _MOUNTTREE_H */ +#endif /* LIBS_UIO_MOUNTTREE_H_ */ diff --git a/sc2/src/libs/uio/paths.h b/sc2/src/libs/uio/paths.h index 8813c1379..bb5090d2f 100644 --- a/sc2/src/libs/uio/paths.h +++ b/sc2/src/libs/uio/paths.h @@ -18,8 +18,8 @@ * */ -#ifndef _PATHS_H -#define _PATHS_H +#ifndef LIBS_UIO_PATHS_H_ +#define LIBS_UIO_PATHS_H_ typedef struct uio_PathComp uio_PathComp; @@ -92,5 +92,5 @@ uio_PathComp *uio_makePathComps(const char *path, uio_PathComp *upComp); void uio_printPathComp(FILE *outStream, const uio_PathComp *comp); void uio_printPathToComp(FILE *outStream, const uio_PathComp *comp); -#endif /* _PATHS_H */ +#endif /* LIBS_UIO_PATHS_H_ */ diff --git a/sc2/src/libs/uio/physical.h b/sc2/src/libs/uio/physical.h index da336a15f..71bc8e6aa 100644 --- a/sc2/src/libs/uio/physical.h +++ b/sc2/src/libs/uio/physical.h @@ -18,8 +18,8 @@ * */ -#ifndef _PHYSICAL_H -#define _PHYSICAL_H +#ifndef LIBS_UIO_PHYSICAL_H_ +#define LIBS_UIO_PHYSICAL_H_ #ifndef uio_INTERNAL_PHYSICAL typedef void *uio_PRootExtra; @@ -87,6 +87,6 @@ void uio_PRoot_unrefHandle(uio_PRoot *pRoot); void uio_PRoot_refMount(uio_PRoot *pRoot); void uio_PRoot_unrefMount(uio_PRoot *pRoot); -#endif /* _PHYSICAL_H */ +#endif /* LIBS_UIO_PHYSICAL_H_ */ diff --git a/sc2/src/libs/uio/uioport.h b/sc2/src/libs/uio/uioport.h index d9ef5d47d..69d7e8e2d 100644 --- a/sc2/src/libs/uio/uioport.h +++ b/sc2/src/libs/uio/uioport.h @@ -18,8 +18,8 @@ * */ -#ifndef _UIOPORT_H -#define _UIOPORT_H +#ifndef LIBS_UIO_UIOPORT_H_ +#define LIBS_UIO_UIOPORT_H_ #ifdef _MSC_VER # include @@ -169,5 +169,5 @@ typedef unsigned short mode_t; int readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result); #endif -#endif /* _UIOPORT_H */ +#endif /* LIBS_UIO_UIOPORT_H_ */ diff --git a/sc2/src/libs/uio/uiostream.h b/sc2/src/libs/uio/uiostream.h index da374969e..f65487e0f 100644 --- a/sc2/src/libs/uio/uiostream.h +++ b/sc2/src/libs/uio/uiostream.h @@ -18,8 +18,8 @@ * */ -#ifndef _STREAM_H -#define _STREAM_H +#ifndef LIBS_UIO_UIOSTREAM_H_ +#define LIBS_UIO_UIOSTREAM_H_ typedef struct uio_Stream uio_Stream; @@ -92,6 +92,6 @@ struct uio_Stream { #endif /* uio_INTERNAL */ -#endif /* _STREAM_H */ +#endif /* LIBS_UIO_UIOSTREAM_H_ */ diff --git a/sc2/src/libs/uio/uioutils.h b/sc2/src/libs/uio/uioutils.h index 309cc1681..68258c3c2 100644 --- a/sc2/src/libs/uio/uioutils.h +++ b/sc2/src/libs/uio/uioutils.h @@ -18,8 +18,8 @@ * */ -#ifndef _UIOUTILS_H -#define _UIOUTILS_H +#ifndef LIBS_UIO_UIOUTILS_H_ +#define LIBS_UIO_UIOUTILS_H_ #include @@ -88,5 +88,5 @@ minu(unsigned int i1, unsigned int i2) { } -#endif /* _UIOUTILS_H */ +#endif /* LIBS_UIO_UIOUTILS_H_ */ diff --git a/sc2/src/libs/uio/utils.h b/sc2/src/libs/uio/utils.h index 11cf5ce29..313bf67ed 100644 --- a/sc2/src/libs/uio/utils.h +++ b/sc2/src/libs/uio/utils.h @@ -18,8 +18,8 @@ * */ -#ifndef _UTILS_H -#define _UTILS_H +#ifndef LIBS_UIO_UTILS_H_ +#define LIBS_UIO_UTILS_H_ #include @@ -39,5 +39,5 @@ void uio_releaseStdioAccess(uio_StdioAccessHandle *handle); char *uio_vasprintf(const char *format, va_list args); char *uio_asprintf(const char *format, ...); -#endif /* _UTILS_H */ +#endif /* LIBS_UIO_UTILS_H_ */ diff --git a/sc2/src/libs/uioutils.h b/sc2/src/libs/uioutils.h index 6748dd144..7cff44bb4 100644 --- a/sc2/src/libs/uioutils.h +++ b/sc2/src/libs/uioutils.h @@ -18,10 +18,10 @@ * */ -#ifndef _UIOUTILS_H -#define _UIOUTILS_H +#ifndef LIBS_UIOUTILS_H_ +#define LIBS_UIOUTILS_H_ #include "uio/utils.h" -#endif /* _UIOUTILS_H */ +#endif /* LIBS_UIOUTILS_H_ */ diff --git a/sc2/src/libs/video/dukvid.h b/sc2/src/libs/video/dukvid.h index 6fcec452c..a6d70b0f9 100644 --- a/sc2/src/libs/video/dukvid.h +++ b/sc2/src/libs/video/dukvid.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _DUKVID_H -#define _DUKVID_H +#ifndef LIBS_VIDEO_DUKVID_H_ +#define LIBS_VIDEO_DUKVID_H_ #include "libs/video/videodec.h" @@ -33,4 +33,4 @@ typedef enum dukve_Other = -1000, } DukVid_Error; -#endif // _DUKVID_H +#endif // LIBS_VIDEO_DUKVID_H_ diff --git a/sc2/src/libs/video/video.h b/sc2/src/libs/video/video.h index 928c120ac..5e76aa4b4 100644 --- a/sc2/src/libs/video/video.h +++ b/sc2/src/libs/video/video.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UQM_VIDEO_H -#define _UQM_VIDEO_H +#ifndef LIBS_VIDEO_VIDEO_H_ +#define LIBS_VIDEO_VIDEO_H_ #include "libs/vidlib.h" #include "libs/sndlib.h" @@ -53,4 +53,4 @@ typedef struct tfb_videoclip extern VIDEO_REF _init_video_file(const char *pStr); -#endif // _UQM_VIDEO_H +#endif // LIBS_VIDEO_VIDEO_H_ diff --git a/sc2/src/libs/video/videodec.h b/sc2/src/libs/video/videodec.h index a645f06e7..2d75c9861 100644 --- a/sc2/src/libs/video/videodec.h +++ b/sc2/src/libs/video/videodec.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _VIDEODEC_H -#define _VIDEODEC_H +#ifndef LIBS_VIDEO_VIDEODEC_H_ +#define LIBS_VIDEO_VIDEODEC_H_ #include "libs/vidlib.h" #include "libs/video/video.h" @@ -121,4 +121,4 @@ void VideoDecoder_Free (TFB_VideoDecoder *decoder); const char* VideoDecoder_GetName (TFB_VideoDecoder *decoder); -#endif // _VIDEODEC_H +#endif // LIBS_VIDEO_VIDEODEC_H_ diff --git a/sc2/src/libs/video/vidplayer.h b/sc2/src/libs/video/vidplayer.h index 354e38ec2..78e4edb01 100644 --- a/sc2/src/libs/video/vidplayer.h +++ b/sc2/src/libs/video/vidplayer.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _VIDPLAYER_H -#define _VIDPLAYER_H +#ifndef LIBS_VIDEO_VIDPLAYER_H_ +#define LIBS_VIDEO_VIDPLAYER_H_ #include "video.h" @@ -28,4 +28,4 @@ extern bool TFB_ProcessVideoFrame (VIDEO_REF vid); extern uint32 TFB_GetVideoPosition (VIDEO_REF VidRef); extern bool TFB_SeekVideo (VIDEO_REF VidRef, uint32 pos); -#endif // _VIDPLAYER_H +#endif // LIBS_VIDEO_VIDPLAYER_H_ diff --git a/sc2/src/libs/vidlib.h b/sc2/src/libs/vidlib.h index 786470814..cef74156a 100644 --- a/sc2/src/libs/vidlib.h +++ b/sc2/src/libs/vidlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _VIDLIB_H -#define _VIDLIB_H +#ifndef LIBS_VIDLIB_H_ +#define LIBS_VIDLIB_H_ #include "libs/compiler.h" #include "libs/sndlib.h" @@ -57,4 +57,4 @@ extern LEGACY_VIDEO_REF PlayLegacyVideo (LEGACY_VIDEO vid); extern void StopLegacyVideo (LEGACY_VIDEO_REF ref); extern BOOLEAN PlayingLegacyVideo (LEGACY_VIDEO_REF ref); -#endif /* _VIDLIB_H */ +#endif /* LIBS_VIDLIB_H_ */ diff --git a/sc2/src/port.h b/sc2/src/port.h index f6581db9c..79ab0ac5e 100644 --- a/sc2/src/port.h +++ b/sc2/src/port.h @@ -1,5 +1,5 @@ -#ifndef _PORT_H -#define _PORT_H +#ifndef PORT_H_ +#define PORT_H_ #include "config.h" @@ -545,5 +545,5 @@ typedef unsigned int wint_t; // REJECT_DRIVE_PATH_WITHOUT_SLASH can also be defined, if paths of the form // "d:foo/bar" (without a slash after the drive letter) are to be rejected. -#endif /* _PORT_H */ +#endif /* PORT_H_ */ diff --git a/sc2/src/symbian/config.h b/sc2/src/symbian/config.h index 328902060..c97b49e20 100644 --- a/sc2/src/symbian/config.h +++ b/sc2/src/symbian/config.h @@ -1,8 +1,8 @@ /* This file contains some compile-time configuration options for Symbian */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef SYMBIAN_CONFIG_H_ +#define SYMBIAN_CONFIG_H_ /* Directory where the UQM game data is located */ #define CONTENTDIR "content" @@ -54,4 +54,4 @@ #define PATH_MAX _POSIX_PATH_MAX -#endif /* _CONFIG_H */ +#endif /* SYMBIAN_CONFIG_H_ */ diff --git a/sc2/src/types.h b/sc2/src/types.h index 8489d2bce..e979aca2a 100644 --- a/sc2/src/types.h +++ b/sc2/src/types.h @@ -19,8 +19,8 @@ * Compiled from various sources */ -#ifndef _TYPES_H -#define _TYPES_H +#ifndef TYPES_H_ +#define TYPES_H_ #include "config.h" @@ -177,4 +177,4 @@ UQM_COMPILE_TIME_ASSERT(uint64, sizeof(uint64) == 8); #define UINT16_MAX 0xffff /* 65535U */ #define UINT32_MAX 0xffffffff /* 4294967295U */ -#endif /* _TYPES_H */ +#endif /* TYPES_H_ */ diff --git a/sc2/src/uqm/battle.h b/sc2/src/uqm/battle.h index ea4fc9492..8e93e36ca 100644 --- a/sc2/src/uqm/battle.h +++ b/sc2/src/uqm/battle.h @@ -13,8 +13,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _BATTLE_H -#define _BATTLE_H +#ifndef UQM_BATTLE_H_ +#define UQM_BATTLE_H_ #include "options.h" #include "libs/compiler.h" @@ -56,4 +56,4 @@ BOOLEAN Battle (BattleFrameCallback *); extern void BattleSong (BOOLEAN DoPlay); extern void FreeBattleSong (void); -#endif /* _BATTLE_H */ +#endif /* UQM_BATTLE_H_ */ diff --git a/sc2/src/uqm/battlecontrols.h b/sc2/src/uqm/battlecontrols.h index f368eee46..f12738ce9 100644 --- a/sc2/src/uqm/battlecontrols.h +++ b/sc2/src/uqm/battlecontrols.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _BATTLECONTROLS_H -#define _BATTLECONTROLS_H +#ifndef UQM_BATTLECONTROLS_H_ +#define UQM_BATTLECONTROLS_H_ typedef struct BattleInputHandlers BattleInputHandlers; typedef struct InputContext InputContext; @@ -88,6 +88,6 @@ void InputContext_delete (InputContext *context); // Call InputContext->handlers->freeContext() to release an // InputContext. -#endif /* _BATTLECONTROLS_H */ +#endif /* UQM_BATTLECONTROLS_H_ */ diff --git a/sc2/src/uqm/build.h b/sc2/src/uqm/build.h index b94aa8296..55e0f2055 100644 --- a/sc2/src/uqm/build.h +++ b/sc2/src/uqm/build.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _BUILD_H -#define _BUILD_H +#ifndef UQM_BUILD_H_ +#define UQM_BUILD_H_ #include "races.h" #include "displist.h" @@ -60,5 +60,5 @@ extern RACE_DESC *load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData); extern void free_ship (RACE_DESC *RaceDescPtr, BOOLEAN FreeIconData, BOOLEAN FreeBattleData); -#endif /* _BUILD_H */ +#endif /* UQM_BUILD_H_ */ diff --git a/sc2/src/uqm/clock.h b/sc2/src/uqm/clock.h index 41692709f..b16898f1d 100644 --- a/sc2/src/uqm/clock.h +++ b/sc2/src/uqm/clock.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CLOCK_H -#define _CLOCK_H +#ifndef UQM_CLOCK_H_ +#define UQM_CLOCK_H_ #include "libs/tasklib.h" #include "displist.h" @@ -100,5 +100,5 @@ extern void UnlockGameClock (void); // but not much else extern BOOLEAN GameClockRunning (void); -#endif /* _CLOCK_H */ +#endif /* UQM_CLOCK_H_ */ diff --git a/sc2/src/uqm/cnctdlg.h b/sc2/src/uqm/cnctdlg.h index 5492601b5..acfc8c605 100644 --- a/sc2/src/uqm/cnctdlg.h +++ b/sc2/src/uqm/cnctdlg.h @@ -18,14 +18,14 @@ #ifdef NETPLAY -#ifndef _CNCTDLG_H -#define _CNCTDLG_H +#ifndef UQM_CNCTDLG_H_ +#define UQM_CNCTDLG_H_ #include "libs/compiler.h" BOOLEAN MeleeConnectDialog (int side); -#endif /* _CNCTDLG_H */ +#endif /* UQM_CNCTDLG_H_ */ #endif /* NETPLAY */ diff --git a/sc2/src/uqm/coderes.h b/sc2/src/uqm/coderes.h index b23f99d69..63e7836b7 100644 --- a/sc2/src/uqm/coderes.h +++ b/sc2/src/uqm/coderes.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CODERES_H -#define _CODERES_H +#ifndef UQM_CODERES_H_ +#define UQM_CODERES_H_ #include "libs/reslib.h" @@ -32,5 +32,5 @@ typedef struct UWORD size; } CODE_REF; -#endif /* _CODERES_H */ +#endif /* UQM_CODERES_H_ */ diff --git a/sc2/src/uqm/collide.h b/sc2/src/uqm/collide.h index 85bdb2019..dfa9c702b 100644 --- a/sc2/src/uqm/collide.h +++ b/sc2/src/uqm/collide.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COLLIDE_H -#define _COLLIDE_H +#ifndef UQM_COLLIDE_H_ +#define UQM_COLLIDE_H_ #include "element.h" @@ -59,5 +59,5 @@ extern void collide (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1); -#endif /* _COLLIDE_H */ +#endif /* UQM_COLLIDE_H_ */ diff --git a/sc2/src/uqm/colors.h b/sc2/src/uqm/colors.h index 81f8f7a02..318fe4951 100644 --- a/sc2/src/uqm/colors.h +++ b/sc2/src/uqm/colors.h @@ -13,8 +13,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COLORS_H -#define _COLORS_H +#ifndef UQM_COLORS_H_ +#define UQM_COLORS_H_ // To be used as an indicator that the actual value of the color does not // matter, for instance in structure initialisations for fields which @@ -436,5 +436,5 @@ BUILD_COLOR (MAKE_RGB15_INIT (0x00, 0x00, 0x00), 0x00) -#endif /* _COLORS_H */ +#endif /* UQM_COLORS_H_ */ diff --git a/sc2/src/uqm/comm.h b/sc2/src/uqm/comm.h index d3fe8708d..feabde905 100644 --- a/sc2/src/uqm/comm.h +++ b/sc2/src/uqm/comm.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COMM_H -#define _COMM_H +#ifndef UQM_COMM_H_ +#define UQM_COMM_H_ #include "globdata.h" #include "units.h" @@ -131,6 +131,6 @@ extern void SetCommIntroMode (CommIntroMode, TimeCount howLong); extern void EnableTalkingAnim (BOOLEAN enable); -#endif /* _COMM_H */ +#endif /* UQM_COMM_H_ */ diff --git a/sc2/src/uqm/comm/commall.h b/sc2/src/uqm/comm/commall.h index 17116efc3..4f8ebeda0 100644 --- a/sc2/src/uqm/comm/commall.h +++ b/sc2/src/uqm/comm/commall.h @@ -14,13 +14,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _COMMALL_H -#define _COMMALL_H +#ifndef UQM_COMM_COMMALL_H_ +#define UQM_COMM_COMMALL_H_ #include "uqm/colors.h" #include "uqm/comm.h" #include "uqm/commglue.h" #include "libs/reslib.h" -#endif /* _COMMALL_H */ +#endif /* UQM_COMM_COMMALL_H_ */ diff --git a/sc2/src/uqm/commanim.h b/sc2/src/uqm/commanim.h index 43cf18f7d..bde0417bf 100644 --- a/sc2/src/uqm/commanim.h +++ b/sc2/src/uqm/commanim.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COMMANIM_H -#define _COMMANIM_H +#ifndef UQM_COMMANIM_H_ +#define UQM_COMMANIM_H_ #include "libs/compiler.h" #include "libs/gfxlib.h" @@ -130,6 +130,6 @@ extern BOOLEAN DrawAlienFrame (SEQUENCE *pSeq, COUNT Num, BOOLEAN fullRedraw); extern void InitCommAnimations (void); extern BOOLEAN ProcessCommAnimations (BOOLEAN fullRedraw, BOOLEAN paused); -#endif /* _COMMANIM_H */ +#endif /* UQM_COMMANIM_H_ */ diff --git a/sc2/src/uqm/commglue.h b/sc2/src/uqm/commglue.h index 06f13f987..7e56dcd52 100644 --- a/sc2/src/uqm/commglue.h +++ b/sc2/src/uqm/commglue.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _COMMGLUE_H -#define _COMMGLUE_H +#ifndef UQM_COMMGLUE_H_ +#define UQM_COMMGLUE_H_ #include "globdata.h" #include "resinst.h" @@ -154,5 +154,5 @@ extern LOCDATA* init_zoqfot_comm (void); extern LOCDATA* init_umgah_comm (void); -#endif /* _COMMGLUE_H */ +#endif /* UQM_COMMGLUE_H_ */ diff --git a/sc2/src/uqm/controls.h b/sc2/src/uqm/controls.h index a3b6f982b..240df2d20 100644 --- a/sc2/src/uqm/controls.h +++ b/sc2/src/uqm/controls.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CONTROLS_H_ -#define _CONTROLS_H_ +#ifndef UQM_CONTROLS_H_ +#define UQM_CONTROLS_H_ #include "libs/compiler.h" #include "libs/strlib.h" diff --git a/sc2/src/uqm/credits.h b/sc2/src/uqm/credits.h index 24fafa935..28ef278ea 100644 --- a/sc2/src/uqm/credits.h +++ b/sc2/src/uqm/credits.h @@ -14,12 +14,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _CREDITS_H -#define _CREDITS_H +#ifndef UQM_CREDITS_H_ +#define UQM_CREDITS_H_ #include "libs/compiler.h" extern void Credits (BOOLEAN WithOuttakes); -#endif /* _CREDITS_H */ +#endif /* UQM_CREDITS_H_ */ diff --git a/sc2/src/uqm/demo.h b/sc2/src/uqm/demo.h index 338261e59..9e4a8a992 100644 --- a/sc2/src/uqm/demo.h +++ b/sc2/src/uqm/demo.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _DEMO_H -#define _DEMO_H +#ifndef UQM_DEMO_H_ +#define UQM_DEMO_H_ #ifndef DEMO_MODE #define DEMO_MODE 0 @@ -44,5 +44,5 @@ extern void JournalInput (INPUT_STATE InputState); #endif -#endif /* _DEMO_H */ +#endif /* UQM_DEMO_H_ */ diff --git a/sc2/src/uqm/displist.h b/sc2/src/uqm/displist.h index 30b3caeed..f7282aa0e 100644 --- a/sc2/src/uqm/displist.h +++ b/sc2/src/uqm/displist.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _DISPLIST_H -#define _DISPLIST_H +#ifndef UQM_DISPLIST_H_ +#define UQM_DISPLIST_H_ #include #include "port.h" @@ -120,5 +120,5 @@ extern void RemoveQueue (QUEUE *pq, HLINK hLink); extern COUNT CountLinks (QUEUE *pq); void ForAllLinks(QUEUE *pq, void (*callback)(LINK *, void *), void *arg); -#endif /* _DISPLIST_H */ +#endif /* UQM_DISPLIST_H_ */ diff --git a/sc2/src/uqm/element.h b/sc2/src/uqm/element.h index fab58d126..870bef683 100644 --- a/sc2/src/uqm/element.h +++ b/sc2/src/uqm/element.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _ELEMENT_H -#define _ELEMENT_H +#ifndef UQM_ELEMENT_H_ +#define UQM_ELEMENT_H_ #include "displist.h" #include "units.h" @@ -230,5 +230,5 @@ extern void MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy); extern BOOLEAN CalculateGravity (ELEMENT *ElementPtr); -#endif /* _ELEMENT_H */ +#endif /* UQM_ELEMENT_H_ */ diff --git a/sc2/src/uqm/encount.h b/sc2/src/uqm/encount.h index aed519e61..88a0ef7d3 100644 --- a/sc2/src/uqm/encount.h +++ b/sc2/src/uqm/encount.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _ENCOUNT_H -#define _ENCOUNT_H +#ifndef UQM_ENCOUNT_H_ +#define UQM_ENCOUNT_H_ typedef struct brief_ship_info BRIEF_SHIP_INFO; typedef struct encounter ENCOUNTER; @@ -190,5 +190,5 @@ extern void GenerateIlwrath (BYTE control); extern SIZE EncounterRace; extern BYTE EncounterGroup; -#endif /* _ENCOUNT_H */ +#endif /* UQM_ENCOUNT_H_ */ diff --git a/sc2/src/uqm/flash.h b/sc2/src/uqm/flash.h index d3c7bb568..d0b9a4bce 100644 --- a/sc2/src/uqm/flash.h +++ b/sc2/src/uqm/flash.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLASH_H -#define _FLASH_H +#ifndef UQM_FLASH_H_ +#define UQM_FLASH_H_ /* * This code can draw three kinds of flashing areas. @@ -211,5 +211,5 @@ void Flash_setCacheSize (FlashContext *context, COUNT size); COUNT Flash_getCacheSize (const FlashContext *context); -#endif /* _FLASH_H */ +#endif /* UQM_FLASH_H_ */ diff --git a/sc2/src/uqm/fmv.h b/sc2/src/uqm/fmv.h index cb820f7ea..2569b0959 100644 --- a/sc2/src/uqm/fmv.h +++ b/sc2/src/uqm/fmv.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FMV_H -#define _FMV_H +#ifndef UQM_FMV_H_ +#define UQM_FMV_H_ #include "libs/compiler.h" #include "libs/sndlib.h" @@ -29,5 +29,5 @@ extern void DoShipSpin (COUNT index, MUSIC_REF hMusic); extern BOOLEAN ShowPresentation (RESOURCE presentation); -#endif /* _FMV_H */ +#endif /* UQM_FMV_H_ */ diff --git a/sc2/src/uqm/gameev.h b/sc2/src/uqm/gameev.h index d7bb9b0e2..f4b8571d2 100644 --- a/sc2/src/uqm/gameev.h +++ b/sc2/src/uqm/gameev.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _GAMEEV_H -#define _GAMEEV_H +#ifndef UQM_GAMEEV_H_ +#define UQM_GAMEEV_H_ #include "libs/compiler.h" #include "libs/gfxlib.h" @@ -57,5 +57,5 @@ extern void SetRaceDest (BYTE which_race, COORD x, COORD y, BYTE days_left, BYTE func_index); -#endif /* _GAMEEV_H */ +#endif /* UQM_GAMEEV_H_ */ diff --git a/sc2/src/uqm/gameopt.h b/sc2/src/uqm/gameopt.h index c08fa55b8..23180c8d4 100644 --- a/sc2/src/uqm/gameopt.h +++ b/sc2/src/uqm/gameopt.h @@ -13,8 +13,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _GAMEOPT_H -#define _GAMEOPT_H +#ifndef UQM_GAMEOPT_H_ +#define UQM_GAMEOPT_H_ #include "libs/compiler.h" #include "libs/gfxlib.h" @@ -25,5 +25,5 @@ extern BOOLEAN GameOptions (void); typedef void (NamingCallback) (void); extern void SetNamingCallback (NamingCallback *); -#endif /* _GAMEOPT_H */ +#endif /* UQM_GAMEOPT_H_ */ diff --git a/sc2/src/uqm/gamestr.h b/sc2/src/uqm/gamestr.h index 48a811ba0..38916822c 100644 --- a/sc2/src/uqm/gamestr.h +++ b/sc2/src/uqm/gamestr.h @@ -19,8 +19,8 @@ * the game. libs/strlib.h is for the string library. */ -#ifndef _GAMESTR_H -#define _GAMESTR_H +#ifndef UQM_GAMESTR_H_ +#define UQM_GAMESTR_H_ #include "libs/strlib.h" @@ -82,5 +82,5 @@ extern STRING GameStrings; -#endif /* _GAMESTR_H */ +#endif /* UQM_GAMESTR_H_ */ diff --git a/sc2/src/uqm/globdata.h b/sc2/src/uqm/globdata.h index 7651db6dc..4dfc87b57 100644 --- a/sc2/src/uqm/globdata.h +++ b/sc2/src/uqm/globdata.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GLOBDATA_H -#define _GLOBDATA_H +#ifndef UQM_GLOBDATA_H_ +#define UQM_GLOBDATA_H_ #include "clock.h" #include "libs/gfxlib.h" @@ -1009,5 +1009,5 @@ extern void InitGlobData (void); extern BOOLEAN InitGameStructures (void); extern void UninitGameStructures (void); -#endif /* _GLOBDATA_H */ +#endif /* UQM_GLOBDATA_H_ */ diff --git a/sc2/src/uqm/grpinfo.h b/sc2/src/uqm/grpinfo.h index 867525377..7db29b8fa 100644 --- a/sc2/src/uqm/grpinfo.h +++ b/sc2/src/uqm/grpinfo.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GRPINFO_H -#define _GRPINFO_H +#ifndef UQM_GRPINFO_H_ +#define UQM_GRPINFO_H_ #include "port.h" #include "libs/compiler.h" @@ -82,4 +82,4 @@ LockIpGroup (const QUEUE *pq, HIPGROUP h) extern HIPGROUP BuildGroup (QUEUE *pDstQueue, BYTE race_id); -#endif /* _GRPINFO_H */ +#endif /* UQM_GRPINFO_H_ */ diff --git a/sc2/src/uqm/hyper.h b/sc2/src/uqm/hyper.h index 6176e77f5..f4b207a80 100644 --- a/sc2/src/uqm/hyper.h +++ b/sc2/src/uqm/hyper.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _HYPER_H -#define _HYPER_H +#ifndef UQM_HYPER_H_ +#define UQM_HYPER_H_ #include "element.h" #include "units.h" @@ -79,5 +79,5 @@ extern BOOLEAN hyper_transition (ELEMENT *ElementPtr); extern void HyperspaceMenu (void); extern void SaveSisHyperState (void); -#endif /* _HYPER_H */ +#endif /* UQM_HYPER_H_ */ diff --git a/sc2/src/uqm/init.h b/sc2/src/uqm/init.h index f9dba517e..f0356a570 100644 --- a/sc2/src/uqm/init.h +++ b/sc2/src/uqm/init.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _INIT_H -#define _INIT_H +#ifndef UQM_INIT_H_ +#define UQM_INIT_H_ #include "libs/gfxlib.h" #include "libs/reslib.h" @@ -35,5 +35,5 @@ extern BOOLEAN load_animation (FRAME *pixarray, RESOURCE big_res, RESOURCE med_res, RESOURCE sml_res); extern BOOLEAN free_image (FRAME *pixarray); -#endif /* _INIT_H */ +#endif /* UQM_INIT_H_ */ diff --git a/sc2/src/uqm/intel.h b/sc2/src/uqm/intel.h index b5381acaa..9c6fac8f7 100644 --- a/sc2/src/uqm/intel.h +++ b/sc2/src/uqm/intel.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _INTEL_H -#define _INTEL_H +#ifndef UQM_INTEL_H_ +#define UQM_INTEL_H_ #include "battlecontrols.h" #include "controls.h" @@ -74,6 +74,6 @@ extern BOOLEAN ThrustShip (ELEMENT *ShipPtr, COUNT angle); #define AWESOME_RATING (BYTE)(1 << 6) -#endif /* _INTEL_H */ +#endif /* UQM_INTEL_H_ */ diff --git a/sc2/src/uqm/load.h b/sc2/src/uqm/load.h index c3859db5d..4a04871b1 100644 --- a/sc2/src/uqm/load.h +++ b/sc2/src/uqm/load.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _LOAD_H -#define _LOAD_H +#ifndef UQM_LOAD_H_ +#define UQM_LOAD_H_ #include "sis.h" // for SUMMARY_DESC @@ -27,5 +27,5 @@ extern ACTIVITY NextActivity; extern BOOLEAN LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc); -#endif /* _LOAD_H */ +#endif /* UQM_LOAD_H_ */ diff --git a/sc2/src/uqm/master.h b/sc2/src/uqm/master.h index 50160c0f1..aedcf4486 100644 --- a/sc2/src/uqm/master.h +++ b/sc2/src/uqm/master.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _MASTER_H -#define _MASTER_H +#ifndef UQM_MASTER_H_ +#define UQM_MASTER_H_ #include "races.h" #include "libs/compiler.h" @@ -58,5 +58,5 @@ COUNT GetShipCostFromIndex (unsigned Index); FRAME GetShipIconsFromIndex (unsigned Index); FRAME GetShipMeleeIconsFromIndex (unsigned Index); -#endif /* _MASTER_H */ +#endif /* UQM_MASTER_H_ */ diff --git a/sc2/src/uqm/menustat.h b/sc2/src/uqm/menustat.h index 008a40eec..9baf19801 100644 --- a/sc2/src/uqm/menustat.h +++ b/sc2/src/uqm/menustat.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MENUSTAT_H -#define _MENUSTAT_H +#ifndef UQM_MENUSTAT_H_ +#define UQM_MENUSTAT_H_ #include "libs/gfxlib.h" #include "libs/sndlib.h" @@ -120,5 +120,5 @@ enum extern BOOLEAN DoMenuChooser (MENU_STATE *pMS, BYTE BaseState); extern void DrawMenuStateStrings (BYTE beg_index, SWORD NewState); -#endif /* _MENUSTAT_H */ +#endif /* UQM_MENUSTAT_H_ */ diff --git a/sc2/src/uqm/nameref.h b/sc2/src/uqm/nameref.h index 5f8143580..5192670c5 100644 --- a/sc2/src/uqm/nameref.h +++ b/sc2/src/uqm/nameref.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _NAMEREF_H -#define _NAMEREF_H +#ifndef UQM_NAMEREF_H_ +#define UQM_NAMEREF_H_ #include "libs/reslib.h" @@ -29,5 +29,5 @@ #define LoadSound LoadSoundInstance #define LoadMusic LoadMusicInstance -#endif /* _NAMEREF_H */ +#endif /* UQM_NAMEREF_H_ */ diff --git a/sc2/src/uqm/oscill.h b/sc2/src/uqm/oscill.h index 34e3f2a94..e2fc25a37 100644 --- a/sc2/src/uqm/oscill.h +++ b/sc2/src/uqm/oscill.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _OSCILL_H -#define _OSCILL_H +#ifndef UQM_OSCILL_H_ +#define UQM_OSCILL_H_ #include "libs/compiler.h" #include "libs/gfxlib.h" @@ -32,5 +32,5 @@ extern void InitSlider (int x, int y, int width, FRAME sliderFrame, extern void SetSliderImage (FRAME f); void DrawSlider (void); -#endif /* _OSCILL_H */ +#endif /* UQM_OSCILL_H_ */ diff --git a/sc2/src/uqm/planets/elemdata.h b/sc2/src/uqm/planets/elemdata.h index f37dfa386..b9efd8394 100644 --- a/sc2/src/uqm/planets/elemdata.h +++ b/sc2/src/uqm/planets/elemdata.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _ELEMDATA_H -#define _ELEMDATA_H +#ifndef UQM_PLANETS_ELEMDATA_H_ +#define UQM_PLANETS_ELEMDATA_H_ #include "libs/compiler.h" @@ -205,5 +205,5 @@ enum extern const BYTE *Elements; -#endif /* _ELEMDATA_H */ +#endif /* UQM_PLANETS_ELEMDATA_H_ */ diff --git a/sc2/src/uqm/planets/generate/genall.h b/sc2/src/uqm/planets/generate/genall.h index 2175c453d..3776cfff8 100644 --- a/sc2/src/uqm/planets/generate/genall.h +++ b/sc2/src/uqm/planets/generate/genall.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _GENALL_H -#define _GENALL_H +#ifndef UQM_PLANETS_GENERATE_GENALL_H_ +#define UQM_PLANETS_GENERATE_GENALL_H_ #include "gendefault.h" #include "types.h" @@ -23,5 +23,5 @@ #include "libs/compiler.h" -#endif /* _GENALL_H */ +#endif /* UQM_PLANETS_GENERATE_GENALL_H_ */ diff --git a/sc2/src/uqm/planets/lander.h b/sc2/src/uqm/planets/lander.h index f5d7aaeb3..1d3e8ff2b 100644 --- a/sc2/src/uqm/planets/lander.h +++ b/sc2/src/uqm/planets/lander.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LANDER_H -#define _LANDER_H +#ifndef UQM_PLANETS_LANDER_H_ +#define UQM_PLANETS_LANDER_H_ #include "elemdata.h" #include "libs/compiler.h" @@ -76,5 +76,5 @@ enum PS_NON_PLAYER, }; -#endif /* _LANDER_H */ +#endif /* UQM_PLANETS_LANDER_H_ */ diff --git a/sc2/src/uqm/planets/lifeform.h b/sc2/src/uqm/planets/lifeform.h index f260a79a5..88b9609b7 100644 --- a/sc2/src/uqm/planets/lifeform.h +++ b/sc2/src/uqm/planets/lifeform.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LIFEFORM_H -#define _LIFEFORM_H +#ifndef UQM_PLANETS_LIFEFORM_H_ +#define UQM_PLANETS_LIFEFORM_H_ #include "libs/compiler.h" @@ -65,5 +65,5 @@ typedef struct extern const LIFEFORM_DESC CreatureData[]; -#endif /* _LIFEFORM_H */ +#endif /* UQM_PLANETS_LIFEFORM_H_ */ diff --git a/sc2/src/uqm/planets/plandata.h b/sc2/src/uqm/planets/plandata.h index 7cf240bac..a1a04670a 100644 --- a/sc2/src/uqm/planets/plandata.h +++ b/sc2/src/uqm/planets/plandata.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _PLANDATA_H -#define _PLANDATA_H +#ifndef UQM_PLANETS_PLANDATA_H_ +#define UQM_PLANETS_PLANDATA_H_ #include "libs/reslib.h" @@ -328,5 +328,5 @@ enum extern const PlanetFrame *PlanData; -#endif /* _PLANDATA_H */ +#endif /* UQM_PLANETS_PLANDATA_H_ */ diff --git a/sc2/src/uqm/planets/planets.h b/sc2/src/uqm/planets/planets.h index 84370087a..8792a1e39 100644 --- a/sc2/src/uqm/planets/planets.h +++ b/sc2/src/uqm/planets/planets.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _PLANETS_H -#define _PLANETS_H +#ifndef UQM_PLANETS_PLANETS_H_ +#define UQM_PLANETS_PLANETS_H_ #define END_INTERPLANETARY START_INTERPLANETARY @@ -286,5 +286,5 @@ extern void GetPlanetOrMoonName (UNICODE *buf, COUNT bufsize); extern void PlanetOrbitMenu (void); extern void SaveSolarSysLocation (void); -#endif /* _PLANETS_H */ +#endif /* UQM_PLANETS_PLANETS_H_ */ diff --git a/sc2/src/uqm/planets/scan.h b/sc2/src/uqm/planets/scan.h index 76b9b702b..b8e683da2 100644 --- a/sc2/src/uqm/planets/scan.h +++ b/sc2/src/uqm/planets/scan.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SCAN_H -#define _SCAN_H +#ifndef UQM_PLANETS_SCAN_H_ +#define UQM_PLANETS_SCAN_H_ typedef struct scan_desc SCAN_DESC; typedef struct scan_block SCAN_BLOCK; @@ -62,5 +62,5 @@ COUNT countNodesRetrieved (PLANET_INFO *planetInfo, BYTE scanType); void setNodeRetrieved (PLANET_INFO *planetInfo, BYTE scanType, BYTE nodeNr); void setNodeNotRetrieved (PLANET_INFO *planetInfo, BYTE scanType, BYTE nodeNr); -#endif /* _SCAN_H */ +#endif /* UQM_PLANETS_SCAN_H_ */ diff --git a/sc2/src/uqm/planets/sundata.h b/sc2/src/uqm/planets/sundata.h index b55a53681..ceea9d4a5 100644 --- a/sc2/src/uqm/planets/sundata.h +++ b/sc2/src/uqm/planets/sundata.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SUNDATA_H -#define _SUNDATA_H +#ifndef UQM_PLANETS_SUNDATA_H_ +#define UQM_PLANETS_SUNDATA_H_ #include "plandata.h" #include "libs/compiler.h" @@ -58,5 +58,5 @@ extern DWORD DoPlanetaryAnalysis (SYSTEM_INFO *SysInfoPtr, extern SYSTEM_INFO CurSysInfo; -#endif /* _SUNDATA_H */ +#endif /* UQM_PLANETS_SUNDATA_H_ */ diff --git a/sc2/src/uqm/races.h b/sc2/src/uqm/races.h index 33033d9a1..f4744da42 100644 --- a/sc2/src/uqm/races.h +++ b/sc2/src/uqm/races.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _RACES_H -#define _RACES_H +#ifndef UQM_RACES_H_ +#define UQM_RACES_H_ #include "types.h" #include "libs/compiler.h" @@ -664,5 +664,5 @@ enum BUILD_COLOR (MAKE_RGB15_INIT (0x06, 0x06, 0x06), 0x20), /* BLACK_URQUAN_SHIP */ \ BUILD_COLOR (MAKE_RGB15_INIT (0x14, 0x07, 0x1F), 0x39), /* YEHAT_REBEL_SHIP */ -#endif /* _RACES_H */ +#endif /* UQM_RACES_H_ */ diff --git a/sc2/src/uqm/restart.h b/sc2/src/uqm/restart.h index 0d4de735b..e7a402934 100644 --- a/sc2/src/uqm/restart.h +++ b/sc2/src/uqm/restart.h @@ -14,13 +14,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _RESTART_H -#define _RESTART_H +#ifndef UQM_RESTART_H_ +#define UQM_RESTART_H_ #include "libs/compiler.h" extern BOOLEAN StartGame (void); -#endif /* _RESTART_H */ +#endif /* UQM_RESTART_H_ */ diff --git a/sc2/src/uqm/save.h b/sc2/src/uqm/save.h index 020fdb68e..054884954 100644 --- a/sc2/src/uqm/save.h +++ b/sc2/src/uqm/save.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SAVE_H -#define _SAVE_H +#ifndef UQM_SAVE_H_ +#define UQM_SAVE_H_ #include "sis.h" // for SUMMARY_DESC @@ -24,5 +24,5 @@ extern void SaveProblem (void); extern BOOLEAN SaveGame (COUNT which_game, SUMMARY_DESC *summary_desc); -#endif /* _SAVE_H */ +#endif /* UQM_SAVE_H_ */ diff --git a/sc2/src/uqm/settings.h b/sc2/src/uqm/settings.h index 4641fb658..c57f1c79b 100644 --- a/sc2/src/uqm/settings.h +++ b/sc2/src/uqm/settings.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SETTINGS_H -#define _SETTINGS_H +#ifndef UQM_SETTINGS_H_ +#define UQM_SETTINGS_H_ #include "libs/sndlib.h" @@ -30,5 +30,5 @@ extern void PlaySoundEffect (SOUND S, COUNT Channel, SoundPosition Pos, void *PositionalObject, BYTE Priority); -#endif /* _SETTINGS_H */ +#endif /* UQM_SETTINGS_H_ */ diff --git a/sc2/src/uqm/setup.h b/sc2/src/uqm/setup.h index ccf6fa9a0..a03f42e43 100644 --- a/sc2/src/uqm/setup.h +++ b/sc2/src/uqm/setup.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SETUP_H -#define _SETUP_H +#ifndef UQM_SETUP_H_ +#define UQM_SETUP_H_ #include "displist.h" #include "globdata.h" @@ -75,6 +75,6 @@ void ClearPlayerInput (COUNT playerI); void ClearPlayerInputAll (void); -#endif /* _SETUP_H */ +#endif /* UQM_SETUP_H_ */ diff --git a/sc2/src/uqm/setupmenu.h b/sc2/src/uqm/setupmenu.h index 257b74508..41dbcc260 100644 --- a/sc2/src/uqm/setupmenu.h +++ b/sc2/src/uqm/setupmenu.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SETUPMENU_H -#define _SETUPMENU_H +#ifndef UQM_SETUPMENU_H_ +#define UQM_SETUPMENU_H_ #include "controls.h" @@ -85,4 +85,4 @@ void SetupMenu (void); void GetGlobalOptions (GLOBALOPTS *opts); void SetGlobalOptions (GLOBALOPTS *opts); -#endif // _SETUPMENU_H +#endif // UQM_SETUPMENU_H_ diff --git a/sc2/src/uqm/shipcont.h b/sc2/src/uqm/shipcont.h index 5352afb42..a127fbad1 100644 --- a/sc2/src/uqm/shipcont.h +++ b/sc2/src/uqm/shipcont.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SHIPCONT_H -#define _SHIPCONT_H +#ifndef UQM_SHIPCONT_H_ +#define UQM_SHIPCONT_H_ #include "menustat.h" @@ -33,5 +33,5 @@ extern void ShowRemainingCapacity (void); extern SIZE InventoryDevices (BYTE *pDeviceMap, COUNT Size); -#endif /* _SHIPCONT_H */ +#endif /* UQM_SHIPCONT_H_ */ diff --git a/sc2/src/uqm/ships/ship.h b/sc2/src/uqm/ships/ship.h index 7020d5336..6a9c6d2a4 100644 --- a/sc2/src/uqm/ships/ship.h +++ b/sc2/src/uqm/ships/ship.h @@ -18,8 +18,8 @@ * This file contains definitions that are common to all ship files. */ -#ifndef _SHIP_H -#define _SHIP_H +#ifndef UQM_SHIPS_SHIP_H_ +#define UQM_SHIPS_SHIP_H_ #include "uqm/collide.h" @@ -33,5 +33,5 @@ #include "uqm/ship.h" -#endif /* _SHIP_H */ +#endif /* UQM_SHIPS_SHIP_H_ */ diff --git a/sc2/src/uqm/sounds.h b/sc2/src/uqm/sounds.h index 74750b203..7917ae9c2 100644 --- a/sc2/src/uqm/sounds.h +++ b/sc2/src/uqm/sounds.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SOUNDS_H -#define _SOUNDS_H +#ifndef UQM_SOUNDS_H_ +#define UQM_SOUNDS_H_ #include "element.h" #include "libs/compiler.h" @@ -74,6 +74,6 @@ extern void UpdateSoundPositions (void); extern void FlushSounds (void); extern void RemoveSoundsForObject (ELEMENT *PosObj); -#endif /* _SOUNDS_H */ +#endif /* UQM_SOUNDS_H_ */ diff --git a/sc2/src/uqm/starbase.h b/sc2/src/uqm/starbase.h index ef6f0fe45..8802fad78 100644 --- a/sc2/src/uqm/starbase.h +++ b/sc2/src/uqm/starbase.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STARBASE_H -#define _STARBASE_H +#ifndef UQM_STARBASE_H_ +#define UQM_STARBASE_H_ #include "menustat.h" @@ -44,5 +44,5 @@ extern COUNT WrapText (const UNICODE *pStr, COUNT len, TEXT *tarray, SIZE field_width); // XXX: Doesn't really belong in this file. -#endif /* _STARBASE_H */ +#endif /* UQM_STARBASE_H_ */ diff --git a/sc2/src/uqm/starcon.h b/sc2/src/uqm/starcon.h index e357a0650..cefdb5ec7 100644 --- a/sc2/src/uqm/starcon.h +++ b/sc2/src/uqm/starcon.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _STARCON_H -#define _STARCON_H +#ifndef UQM_STARCON_H_ +#define UQM_STARCON_H_ extern volatile int MainExited; extern void SignalStopMainThread (void); @@ -24,5 +24,5 @@ extern void ProcessUtilityKeys (void); extern int Starcon2Main (void *threadArg); extern void FreeGameData (void); -#endif /* _STARCON_H */ +#endif /* UQM_STARCON_H_ */ diff --git a/sc2/src/uqm/state.h b/sc2/src/uqm/state.h index 560d531e8..7bd51ca7e 100644 --- a/sc2/src/uqm/state.h +++ b/sc2/src/uqm/state.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STATE_H -#define _STATE_H +#ifndef UQM_STATE_H_ +#define UQM_STATE_H_ #include "port.h" #include "libs/compiler.h" @@ -155,5 +155,5 @@ swrite_a32 (void *fp, const DWORD *ar, COUNT count) return 1; } -#endif /* _STATE_H */ +#endif /* UQM_STATE_H_ */ diff --git a/sc2/src/uqm/supermelee/loadmele.h b/sc2/src/uqm/supermelee/loadmele.h index 993c56940..30a0477c7 100644 --- a/sc2/src/uqm/supermelee/loadmele.h +++ b/sc2/src/uqm/supermelee/loadmele.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LOADMELE_H -#define _LOADMELE_H +#ifndef UQM_SUPERMELEE_LOADMELE_H_ +#define UQM_SUPERMELEE_LOADMELE_H_ #define LOAD_TEAM_VIEW_SIZE 5 @@ -56,6 +56,6 @@ bool ReadTeamImage (MeleeTeam *pTI, uio_Stream *load_fp); int WriteTeamImage (const MeleeTeam *pTI, uio_Stream *save_fp); void LoadTeamList (MELEE_STATE *pMS); -#endif /* _LOADMELE_H */ +#endif /* UQM_SUPERMELEE_LOADMELE_H_ */ diff --git a/sc2/src/uqm/supermelee/melee.h b/sc2/src/uqm/supermelee/melee.h index a0a9e4abf..94b600221 100644 --- a/sc2/src/uqm/supermelee/melee.h +++ b/sc2/src/uqm/supermelee/melee.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _MELEE_H -#define _MELEE_H +#ifndef UQM_SUPERMELEE_MELEE_H_ +#define UQM_SUPERMELEE_MELEE_H_ #include "../init.h" #include "libs/gfxlib.h" @@ -125,5 +125,5 @@ void Melee_RemoteChange_ship (MELEE_STATE *pMS, NetConnection *conn, void Melee_RemoteChange_teamName (MELEE_STATE *pMS, NetConnection *conn, COUNT side, const char *name); -#endif /* _MELEE_H */ +#endif /* UQM_SUPERMELEE_MELEE_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/checkbuf.h b/sc2/src/uqm/supermelee/netplay/checkbuf.h index cb7637b17..71159a742 100644 --- a/sc2/src/uqm/supermelee/netplay/checkbuf.h +++ b/sc2/src/uqm/supermelee/netplay/checkbuf.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CHECKBUF_H -#define _CHECKBUF_H +#ifndef UQM_SUPERMELEE_NETPLAY_CHECKBUF_H_ +#define UQM_SUPERMELEE_NETPLAY_CHECKBUF_H_ typedef struct ChecksumEntry ChecksumEntry; typedef struct ChecksumBuffer ChecksumBuffer; @@ -58,5 +58,5 @@ bool ChecksumBuffer_addChecksum(ChecksumBuffer *cb, bool ChecksumBuffer_getChecksum(ChecksumBuffer *cb, BattleFrameCounter frameNr, Checksum *result); -#endif /* _CHECKBUF_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_CHECKBUF_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/checksum.h b/sc2/src/uqm/supermelee/netplay/checksum.h index 95f84bf6b..539de5dd1 100644 --- a/sc2/src/uqm/supermelee/netplay/checksum.h +++ b/sc2/src/uqm/supermelee/netplay/checksum.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CHECKSUM_H -#define _CHECKSUM_H +#ifndef UQM_SUPERMELEE_NETPLAY_CHECKSUM_H_ +#define UQM_SUPERMELEE_NETPLAY_CHECKSUM_H_ #include "types.h" @@ -88,6 +88,6 @@ void addRemoteChecksum(NetConnection *conn, BattleFrameCounter frameNr, Checksum checksum); bool verifyChecksums(BattleFrameCounter frameNr); -#endif /* _CHECKSUM_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_CHECKSUM_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/crc.h b/sc2/src/uqm/supermelee/netplay/crc.h index c1847cf19..01aa6e5c1 100644 --- a/sc2/src/uqm/supermelee/netplay/crc.h +++ b/sc2/src/uqm/supermelee/netplay/crc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _CRC_H -#define _CRC_H +#ifndef UQM_SUPERMELEE_NETPLAY_CRC_H_ +#define UQM_SUPERMELEE_NETPLAY_CRC_H_ typedef struct crc_State crc_State; @@ -49,5 +49,5 @@ uint32 crc_finish(const crc_State *state); (void) 0 #endif -#endif /* _CRC_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_CRC_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netconnection.h b/sc2/src/uqm/supermelee/netplay/netconnection.h index 32c034fad..e3f18ecd0 100644 --- a/sc2/src/uqm/supermelee/netplay/netconnection.h +++ b/sc2/src/uqm/supermelee/netplay/netconnection.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETCONNECTION_H -#define _NETCONNECTION_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETCONNECTION_H_ +#define UQM_SUPERMELEE_NETPLAY_NETCONNECTION_H_ #include "netplay.h" // for NETPLAY_STATISTICS @@ -233,6 +233,6 @@ extern uio_Stream *netplayDebugFile; #endif -#endif /* _NETCONNECTION_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETCONNECTION_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netinput.h b/sc2/src/uqm/supermelee/netplay/netinput.h index ff1f42f7f..8eccbed9a 100644 --- a/sc2/src/uqm/supermelee/netplay/netinput.h +++ b/sc2/src/uqm/supermelee/netplay/netinput.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETINPUT_H -#define _NETINPUT_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETINPUT_H_ +#define UQM_SUPERMELEE_NETPLAY_NETINPUT_H_ #include "../../controls.h" // for BATTLE_INPUT_STATE @@ -46,5 +46,5 @@ bool BattleInputBuffer_pop(BattleInputBuffer *bib, BattleInputBuffer *getBattleInputBuffer(size_t player); -#endif /* _NETINPUT_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETINPUT_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netmelee.h b/sc2/src/uqm/supermelee/netplay/netmelee.h index 6bed21961..a9b1e1e17 100644 --- a/sc2/src/uqm/supermelee/netplay/netmelee.h +++ b/sc2/src/uqm/supermelee/netplay/netmelee.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if !defined(_NETMELEE_H) && defined(NETPLAY) -#define _NETMELEE_H +#if !defined(UQM_SUPERMELEE_NETPLAY_NETMELEE_H_) && defined(NETPLAY) +#define UQM_SUPERMELEE_NETPLAY_NETMELEE_H_ #include "netplay.h" #include "netinput.h" @@ -80,6 +80,6 @@ bool waitReady(NetConnection *conn); bool waitReset(NetConnection *conn, NetState nextState); bool waitResetConnections(NetState nextState); -#endif /* _NETMELEE_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETMELEE_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netmisc.h b/sc2/src/uqm/supermelee/netplay/netmisc.h index e97f2961a..b86d5c334 100644 --- a/sc2/src/uqm/supermelee/netplay/netmisc.h +++ b/sc2/src/uqm/supermelee/netplay/netmisc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETMISC_H -#define _NETMISC_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETMISC_H_ +#define UQM_SUPERMELEE_NETPLAY_NETMISC_H_ typedef struct BattleStateData BattleStateData; @@ -66,6 +66,6 @@ readyFlagsMeaningful(NetState state) { } -#endif /* _NETMISC_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETMISC_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netoptions.h b/sc2/src/uqm/supermelee/netplay/netoptions.h index cdefe21ad..f777f2e78 100644 --- a/sc2/src/uqm/supermelee/netplay/netoptions.h +++ b/sc2/src/uqm/supermelee/netplay/netoptions.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETOPTIONS_H -#define _NETOPTIONS_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETOPTIONS_H_ +#define UQM_SUPERMELEE_NETPLAY_NETOPTIONS_H_ #include "types.h" @@ -45,7 +45,7 @@ typedef struct { extern NetplayOptions netplayOptions; -#endif /* _NETOPTIONS_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETOPTIONS_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netplay.h b/sc2/src/uqm/supermelee/netplay/netplay.h index ae3f533ff..b78c69a1c 100644 --- a/sc2/src/uqm/supermelee/netplay/netplay.h +++ b/sc2/src/uqm/supermelee/netplay/netplay.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if !defined(_NETPLAY_H) && defined(NETPLAY) -#define _NETPLAY_H +#if !defined(UQM_SUPERMELEE_NETPLAY_NETPLAY_H_) && defined(NETPLAY) +#define UQM_SUPERMELEE_NETPLAY_NETPLAY_H_ // NETPLAY can either be unset (in which case we will never get here) // NETPLAY_FULL, or NETPLAY_IPV4 (disables IPv6) @@ -73,5 +73,5 @@ #endif -#endif /* _NETPLAY_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETPLAY_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netrcv.h b/sc2/src/uqm/supermelee/netplay/netrcv.h index 9db577635..8ea7c3a37 100644 --- a/sc2/src/uqm/supermelee/netplay/netrcv.h +++ b/sc2/src/uqm/supermelee/netplay/netrcv.h @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETRCV_H -#define _NETRCV_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETRCV_H_ +#define UQM_SUPERMELEE_NETPLAY_NETRCV_H_ #include "libs/net.h" void dataReadyCallback(NetDescriptor *nd); -#endif /* _NETRCV_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETRCV_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netsend.h b/sc2/src/uqm/supermelee/netplay/netsend.h index 1a2199379..3cd3bf20c 100644 --- a/sc2/src/uqm/supermelee/netplay/netsend.h +++ b/sc2/src/uqm/supermelee/netplay/netsend.h @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETSEND_H -#define _NETSEND_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETSEND_H_ +#define UQM_SUPERMELEE_NETPLAY_NETSEND_H_ #include "packet.h" int sendPacket(NetConnection *conn, Packet *packet); -#endif /* _NETSEND_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETSEND_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/netstate.h b/sc2/src/uqm/supermelee/netplay/netstate.h index f9708b015..07af2c765 100644 --- a/sc2/src/uqm/supermelee/netplay/netstate.h +++ b/sc2/src/uqm/supermelee/netplay/netstate.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NETSTATE_H -#define _NETSTATE_H +#ifndef UQM_SUPERMELEE_NETPLAY_NETSTATE_H_ +#define UQM_SUPERMELEE_NETPLAY_NETSTATE_H_ #include "port.h" @@ -65,5 +65,5 @@ NetState_battleActive(NetState state) { } -#endif /* _NETSTATE_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NETSTATE_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/notify.h b/sc2/src/uqm/supermelee/netplay/notify.h index a492c51e8..3398f8d3f 100644 --- a/sc2/src/uqm/supermelee/netplay/notify.h +++ b/sc2/src/uqm/supermelee/netplay/notify.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NOTIFY_H -#define _NOTIFY_H +#ifndef UQM_SUPERMELEE_NETPLAY_NOTIFY_H_ +#define UQM_SUPERMELEE_NETPLAY_NOTIFY_H_ #include "netplay.h" // for NETPLAY_CHECKSUM @@ -51,5 +51,5 @@ void Netplay_Notify_checksum(NetConnection *conn, #endif -#endif /* _NOTIFY_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_NOTIFY_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/packet.h b/sc2/src/uqm/supermelee/netplay/packet.h index c9980fde6..508ccb1e3 100644 --- a/sc2/src/uqm/supermelee/netplay/packet.h +++ b/sc2/src/uqm/supermelee/netplay/packet.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PACKET_H -#define _PACKET_H +#ifndef UQM_SUPERMELEE_NETPLAY_PACKET_H_ +#define UQM_SUPERMELEE_NETPLAY_PACKET_H_ typedef struct Packet Packet; @@ -273,5 +273,5 @@ Packet_Reset *Packet_Reset_create(uint16 reason); #endif -#endif /* _PACKET_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PACKET_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/packethandlers.h b/sc2/src/uqm/supermelee/netplay/packethandlers.h index 5f4a6025b..0416a104b 100644 --- a/sc2/src/uqm/supermelee/netplay/packethandlers.h +++ b/sc2/src/uqm/supermelee/netplay/packethandlers.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PACKETHANDLERS_H -#define _PACKETHANDLERS_H +#ifndef UQM_SUPERMELEE_NETPLAY_PACKETHANDLERS_H_ +#define UQM_SUPERMELEE_NETPLAY_PACKETHANDLERS_H_ #include "packet.h" @@ -45,4 +45,4 @@ DECLARE_PACKETHANDLER(Abort); DECLARE_PACKETHANDLER(Reset); -#endif /* _PACKETHANDLERS_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PACKETHANDLERS_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/packetq.h b/sc2/src/uqm/supermelee/netplay/packetq.h index 494c61969..999bb44fe 100644 --- a/sc2/src/uqm/supermelee/netplay/packetq.h +++ b/sc2/src/uqm/supermelee/netplay/packetq.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PACKETQ_H -#define _PACKETQ_H +#ifndef UQM_SUPERMELEE_NETPLAY_PACKETQ_H_ +#define UQM_SUPERMELEE_NETPLAY_PACKETQ_H_ typedef struct PacketQueue PacketQueue; diff --git a/sc2/src/uqm/supermelee/netplay/packetsenders.h b/sc2/src/uqm/supermelee/netplay/packetsenders.h index 407db4b61..4051339a5 100644 --- a/sc2/src/uqm/supermelee/netplay/packetsenders.h +++ b/sc2/src/uqm/supermelee/netplay/packetsenders.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PACKETSENDERS_H -#define _PACKETSENDERS_H +#ifndef UQM_SUPERMELEE_NETPLAY_PACKETSENDERS_H_ +#define UQM_SUPERMELEE_NETPLAY_PACKETSENDERS_H_ #include "types.h" @@ -56,6 +56,6 @@ void sendAbort(NetConnection *conn, NetplayAbortReason reason); void sendReset(NetConnection *conn, NetplayResetReason reason); -#endif /* _PACKETSENDERS_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PACKETSENDERS_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/proto/npconfirm.h b/sc2/src/uqm/supermelee/netplay/proto/npconfirm.h index 432e7d5b1..73e5becb3 100644 --- a/sc2/src/uqm/supermelee/netplay/proto/npconfirm.h +++ b/sc2/src/uqm/supermelee/netplay/proto/npconfirm.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _NPCONFIRM_H -#define _NPCONFIRM_H +#ifndef UQM_SUPERMELEE_NETPLAY_PROTO_NPCONFIRM_H_ +#define UQM_SUPERMELEE_NETPLAY_PROTO_NPCONFIRM_H_ #include "../netplay.h" #include "../netconnection.h" @@ -25,6 +25,6 @@ int Netplay_confirm(NetConnection *conn); int Netplay_cancelConfirmation(NetConnection *conn); -#endif /* _NPCONFIRM_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PROTO_NPCONFIRM_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/proto/ready.h b/sc2/src/uqm/supermelee/netplay/proto/ready.h index 296bbf7a6..fd58dc002 100644 --- a/sc2/src/uqm/supermelee/netplay/proto/ready.h +++ b/sc2/src/uqm/supermelee/netplay/proto/ready.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _READY_H -#define _READY_H +#ifndef UQM_SUPERMELEE_NETPLAY_PROTO_READY_H_ +#define UQM_SUPERMELEE_NETPLAY_PROTO_READY_H_ #include "../netconnection.h" @@ -27,5 +27,5 @@ bool Netplay_remoteReady(NetConnection *conn); bool Netplay_isLocalReady(const NetConnection *conn); bool Netplay_isRemoteReady(const NetConnection *conn); -#endif /* _READY_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PROTO_READY_H_ */ diff --git a/sc2/src/uqm/supermelee/netplay/proto/reset.h b/sc2/src/uqm/supermelee/netplay/proto/reset.h index d07a3c4d7..f25d910d7 100644 --- a/sc2/src/uqm/supermelee/netplay/proto/reset.h +++ b/sc2/src/uqm/supermelee/netplay/proto/reset.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _RESET_H -#define _RESET_H +#ifndef UQM_SUPERMELEE_NETPLAY_PROTO_RESET_H_ +#define UQM_SUPERMELEE_NETPLAY_PROTO_RESET_H_ #include "../netconnection.h" #include "../packet.h" @@ -30,5 +30,5 @@ bool Netplay_isLocalReset(const NetConnection *conn); bool Netplay_isRemoteReset(const NetConnection *conn); -#endif /* _RESET_H */ +#endif /* UQM_SUPERMELEE_NETPLAY_PROTO_RESET_H_ */ diff --git a/sc2/src/uqm/supermelee/pickmele.h b/sc2/src/uqm/supermelee/pickmele.h index a214dfba9..674c0366d 100644 --- a/sc2/src/uqm/supermelee/pickmele.h +++ b/sc2/src/uqm/supermelee/pickmele.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _PICKMELE_H -#define _PICKMELE_H +#ifndef UQM_SUPERMELEE_PICKMELE_H_ +#define UQM_SUPERMELEE_PICKMELE_H_ typedef struct getmelee_struct GETMELEE_STATE; @@ -82,5 +82,5 @@ bool setShipSelected(GETMELEE_STATE *gms, COUNT playerI, COUNT choice, #endif /* PICKMELE_INTERNAL */ -#endif /* _PICKMELE_H */ +#endif /* UQM_SUPERMELEE_PICKMELE_H_ */ diff --git a/sc2/src/uqm/tactrans.h b/sc2/src/uqm/tactrans.h index dd51808e3..d21fa2c0d 100644 --- a/sc2/src/uqm/tactrans.h +++ b/sc2/src/uqm/tactrans.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _TACTRANS_H -#define _TACTRANS_H +#ifndef UQM_TACTRANS_H_ +#define UQM_TACTRANS_H_ #include "libs/compiler.h" #include "races.h" @@ -40,6 +40,6 @@ extern void flee_preprocess (ELEMENT *ElementPtr); extern void StopDitty (void); extern void ResetWinnerStarShip (void); -#endif /* _TACTRANS_H */ +#endif /* UQM_TACTRANS_H_ */ diff --git a/sc2/src/uqm/units.h b/sc2/src/uqm/units.h index 303e50558..6c9677319 100644 --- a/sc2/src/uqm/units.h +++ b/sc2/src/uqm/units.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UNITS_H -#define _UNITS_H +#ifndef UQM_UNITS_H_ +#define UQM_UNITS_H_ #include "libs/gfxlib.h" @@ -216,5 +216,5 @@ extern COUNT ARCTAN (SIZE delta_x, SIZE delta_y); #define WRAP_DELTA_Y(dy) ((dy)<0 ? \ ((-(dy)<=LOG_SPACE_HEIGHT>>1)?(dy):(LOG_SPACE_HEIGHT+(dy))) : \ (((dy)<=LOG_SPACE_HEIGHT>>1)?(dy):((dy)-LOG_SPACE_HEIGHT))) -#endif /* _UNITS_H */ +#endif /* UQM_UNITS_H_ */ diff --git a/sc2/src/uqm/util.h b/sc2/src/uqm/util.h index 2add76ec3..2cd49a127 100644 --- a/sc2/src/uqm/util.h +++ b/sc2/src/uqm/util.h @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UTIL_H -#define _UTIL_H +#ifndef UQM_UTIL_H_ +#define UQM_UTIL_H_ #include "libs/compiler.h" #include "libs/gfxlib.h" @@ -28,5 +28,5 @@ extern DWORD SeedRandomNumbers (void); // saveRect can be NULL to save the entire context frame extern STAMP SaveContextFrame (const RECT *saveRect); -#endif /* _UTIL_H */ +#endif /* UQM_UTIL_H_ */ diff --git a/sc2/src/uqm/velocity.h b/sc2/src/uqm/velocity.h index eb2585b17..cd5d4d241 100644 --- a/sc2/src/uqm/velocity.h +++ b/sc2/src/uqm/velocity.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _VELOCITY_H -#define _VELOCITY_H +#ifndef UQM_VELOCITY_H_ +#define UQM_VELOCITY_H_ #include /* for memset */ #include "libs/gfxlib.h" @@ -65,5 +65,5 @@ VelocitySquared (SIZE dx, SIZE dy) #define VELOCITY_TO_WORLD(v) ((v)>>VELOCITY_SHIFT) #define WORLD_TO_VELOCITY(l) ((l)<