adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update all problematic include guards.

Browse Source 
All-caps identifiers that start with an underscore may be reserved
for compiler or library use, and recent versions of gcc or glibc
have been stealing symbols away from us.
This commit is contained in:
Michael Martin
2018-01-20 18:02:03 -08:00
parent 327e3f2566
commit 6428238e51
194 changed files with 566 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/abxadec/abxaud.h
+3 -3
View File
@@ -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_
sc2/src/config_unix.h.in
+3 -3
View File
@@ -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_ */
sc2/src/config_vc6.h
+3 -3
View File
@@ -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_ */
sc2/src/config_win.h.in
+3 -3
View File
@@ -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_ */
sc2/src/endian_uqm.h
+2 -2
View File
@@ -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"
sc2/src/libs/callback/alarm.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/callback/callback.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp_alli.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp_iio.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp_imem.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp_isnd.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdp_ivid.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdpapi.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/cdpint.h
+2 -2
View File
@@ -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"
sc2/src/libs/cdp/cdpmod.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdp/windl.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/cdplib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/compiler.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/declib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/decomp/lzh.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/file.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/gfxlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/context.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/drawable.h
+3 -3
View File
@@ -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 <stdio.h>
#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_ */
sc2/src/libs/graphics/font.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/gfxintrn.h
+3 -3
View File
@@ -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 <stdio.h>
#include <string.h>
@@ -28,5 +28,5 @@
#include "drawable.h"
#include "font.h"
#endif /* _GFXINTRN_H */
#endif /* LIBS_GRAPHICS_GFXINTRN_H_ */
sc2/src/libs/graphics/prim.h
+2 -2
View File
@@ -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
{
sc2/src/libs/graphics/sdl/2xscalers.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/sdl/2xscalers_mmx.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/sdl/opengl.h
+2 -2
View File
@@ -70,9 +70,9 @@ void TFB_GL_UploadTransitionScreen (void);
#endif
/* This is from Win32's <ctype.h> */
#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"
sc2/src/libs/graphics/sdl/sdluio.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/graphics/widgets.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/heap/heap.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/inplib.h
+3 -3
View File
@@ -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 <stddef.h>
#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_ */
sc2/src/libs/input/inpintrn.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/input/sdl/keynames.h
+2 -2
View File
@@ -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);
sc2/src/libs/input/sdl/vcontrol.h
+2 -2
View File
@@ -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)
sc2/src/libs/math/mthintrn.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/math/random.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/mathlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/md5.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/md5/md5.h
+2 -2
View File
@@ -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 <stdio.h>
sc2/src/libs/memlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/mikmod/mikmod.h
+2 -2
View File
@@ -26,8 +26,8 @@
==============================================================================*/
#ifndef _MIKMOD_H_
#define _MIKMOD_H_
#ifndef LIBS_MIKMOD_MIKMOD_H_
#define LIBS_MIKMOD_MIKMOD_H_
#include <stdio.h>
#include <stdlib.h>
sc2/src/libs/mikmod/mikmod_internals.h
+2 -2
View File
@@ -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" {
sc2/src/libs/net.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/bytesex.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/connect/connect.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/connect/listen.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/connect/resolve.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/netmanager/ndesc.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/netmanager/netmanager.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/netmanager/netmanager_bsd.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/netmanager/netmanager_win.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/netport.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/network.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/socket/socket.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/network/socket/socket_bsd.h
+3 -3
View File
@@ -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 <sys/socket.h>
@@ -29,5 +29,5 @@ struct Socket {
#endif /* SOCKET_INTERNAL */
#endif /* _SOCKET_BSD_H */
#endif /* LIBS_NETWORK_SOCKET_SOCKET_BSD_H_ */
sc2/src/libs/network/socket/socket_win.h
+3 -3
View File
@@ -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 <winsock2.h>
@@ -29,6 +29,6 @@ struct Socket {
typedef int socklen_t;
struct sockaddr;
#endif /* _SOCKET_WIN_H */
#endif /* LIBS_NETWORK_SOCKET_SOCKET_WIN_H_ */
sc2/src/libs/network/wspiapiwrap.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/reslib.h
+3 -3
View File
@@ -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 <stdio.h>
#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_ */
sc2/src/libs/resource/index.h
+3 -3
View File
@@ -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 <stdio.h>
#include "libs/reslib.h"
@@ -47,5 +47,5 @@ struct resource_index_desc
size_t numRes;
};
#endif /* _INDEX_H */
#endif /* LIBS_RESOURCE_INDEX_H_ */
sc2/src/libs/resource/resintrn.h
+3 -3
View File
@@ -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 <string.h>
#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_ */
sc2/src/libs/resource/stringbank.h
+3 -3
View File
@@ -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 <stdio.h>
@@ -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_ */
sc2/src/libs/sndlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/audiocore.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/mixer/mixer.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/mixer/mixerint.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/openal/audiodrv_openal.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/sound/sndintrn.h
+3 -3
View File
@@ -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 <stdio.h>
#include "types.h"
@@ -73,4 +73,4 @@ typedef struct tfb_soundsource
extern TFB_SoundSource soundSource[];
#endif /* _SNDINTRN_H */
#endif /* LIBS_SOUND_SNDINTRN_H_ */
sc2/src/libs/sound/sound.h
+3 -3
View File
@@ -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_
sc2/src/libs/strings/strintrn.h
+3 -3
View File
@@ -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 <stdio.h>
#include <string.h>
@@ -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_ */
sc2/src/libs/strlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/tasklib.h
+2 -2
View File
@@ -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"
sc2/src/libs/threadlib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/threads/pthread/posixthreads.h
+2 -2
View File
@@ -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"
sc2/src/libs/threads/sdl/sdlthreads.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/threads/thrcommon.h
+2 -2
View File
@@ -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)
sc2/src/libs/time/sdl/sdltime.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/time/timecommon.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/timelib.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/charhashtable.h
+2 -2
View File
@@ -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
sc2/src/libs/uio/fileblock.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/fstypes.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/getint.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/gphys.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/io.h
+3 -3
View File
@@ -18,8 +18,8 @@
*
*/
#ifndef _IO_H
#define _IO_H
#ifndef LIBS_UIO_IO_H_
#define LIBS_UIO_IO_H_
#include <assert.h>
#include <sys/stat.h>
@@ -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_ */
sc2/src/libs/uio/ioaux.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/iointrn.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/match.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/mem.h
+2 -2
View File
@@ -18,8 +18,8 @@
*
*/
#ifndef _MEM_H
#define _MEM_H
#ifndef LIBS_UIO_MEM_H_
#define LIBS_UIO_MEM_H_
#include <stdlib.h>
#include <string.h>
sc2/src/libs/uio/memdebug.h
+3 -3
View File
@@ -18,8 +18,8 @@
*
*/
#ifndef _MEMDEBUG_H
#define _MEMDEBUG_H
#ifndef LIBS_UIO_MEMDEBUG_H_
#define LIBS_UIO_MEMDEBUG_H_
#include <stdio.h>
#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_ */
sc2/src/libs/uio/mount.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/mounttree.h
+3 -3
View File
@@ -18,8 +18,8 @@
*
*/
#ifndef _MOUNTTREE_H
#define _MOUNTTREE_H
#ifndef LIBS_UIO_MOUNTTREE_H_
#define LIBS_UIO_MOUNTTREE_H_
#include <stdio.h>
#include "mount.h"
@@ -200,5 +200,5 @@ uio_mountInfoIsReadOnly(uio_MountInfo *mountInfo) {
#endif /* uio_INTERNAL */
#endif /* _MOUNTTREE_H */
#endif /* LIBS_UIO_MOUNTTREE_H_ */
sc2/src/libs/uio/paths.h
+3 -3
View File
@@ -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_ */
sc2/src/libs/uio/physical.h
+3 -3
View File
@@ -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_ */

Some files were not shown because too many files have changed in this diff Show More