Fix include guards

Symbols starting with "__" are reserved for use by the compiler.
This commit is contained in:
Andy McFadden 2014-12-22 16:06:55 -08:00
parent 9666ebd97a
commit 524e0926e7
10 changed files with 30 additions and 30 deletions

View File

@ -6,8 +6,8 @@
* Misc stuff (shared between nufxlib and nulib2). This is a collection * Misc stuff (shared between nufxlib and nulib2). This is a collection
* of miscellaneous types and macros that I find generally useful. * of miscellaneous types and macros that I find generally useful.
*/ */
#ifndef __MiscStuff__ #ifndef NUFXLIB_MISCSTUFF_H
#define __MiscStuff__ #define NUFXLIB_MISCSTUFF_H
#define VALGRIND /* assume we're using it */ #define VALGRIND /* assume we're using it */
@ -102,4 +102,4 @@ typedef unsigned char Boolean;
#define kInvalidPtr ((void*)0xa3a3a3a3) #define kInvalidPtr ((void*)0xa3a3a3a3)
#endif /*__MiscStuff__*/ #endif /*NUFXLIB_MISCSTUFF_H*/

View File

@ -6,8 +6,8 @@
* *
* External interface (types, defines, and function prototypes). * External interface (types, defines, and function prototypes).
*/ */
#ifndef __NufxLib__ #ifndef NUFXLIB_NUFXLIB_H
#define __NufxLib__ #define NUFXLIB_NUFXLIB_H
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@ -841,4 +841,4 @@ NUFXLIB_API NuCallback NuSetGlobalErrorMessageHandler(NuCallback messageHandlerF
} }
#endif #endif
#endif /*__NufxLib__*/ #endif /*NUFXLIB_NUFXLIB_H*/

View File

@ -6,8 +6,8 @@
* *
* Global internal declarations and definitions. * Global internal declarations and definitions.
*/ */
#ifndef __NufxLibPriv__ #ifndef NUFXLIB_NUFXLIBPRIV_H
#define __NufxLibPriv__ #define NUFXLIB_NUFXLIBPRIV_H
/* include files that everybody needs */ /* include files that everybody needs */
#include "SysDefs.h" #include "SysDefs.h"
@ -870,4 +870,4 @@ NuThreadFormat Nu_ConvertCompressValToFormat(NuArchive* pArchive,
NuError Nu_GetVersion(long* pMajorVersion, long* pMinorVersion, NuError Nu_GetVersion(long* pMajorVersion, long* pMinorVersion,
long* pBugVersion, const char** ppBuildDate, const char** ppBuildFlags); long* pBugVersion, const char** ppBuildDate, const char** ppBuildFlags);
#endif /*__NufxLibPriv__*/ #endif /*NUFXLIB_NUFXLIBPRIV_H*/

View File

@ -8,8 +8,8 @@
* (such as gcc) is used. The system header files aren't quite sufficient * (such as gcc) is used. The system header files aren't quite sufficient
* to eliminate hordes of warnings. * to eliminate hordes of warnings.
*/ */
#ifndef __SunOS4__ #ifndef NUFXLIB_SUNOS4_H
#define __SunOS4__ #define NUFXLIB_SUNOS4_H
#ifdef __GNUC__ #ifdef __GNUC__
extern int _flsbuf(int, FILE*); extern int _flsbuf(int, FILE*);
@ -43,4 +43,4 @@ extern int toupper(int);
extern int vfprintf(FILE*, const char *, va_list); extern int vfprintf(FILE*, const char *, va_list);
extern char* vsprintf(char *str, const char *format, va_list ap); extern char* vsprintf(char *str, const char *format, va_list ap);
#endif /*__SunOS4__*/ #endif /*NUFXLIB_SUNOS4_H*/

View File

@ -6,8 +6,8 @@
* *
* External type definitions and function prototypes. * External type definitions and function prototypes.
*/ */
#ifndef __SysDefs__ #ifndef NUFXLIB_SYSDEFS_H
#define __SysDefs__ #define NUFXLIB_SYSDEFS_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -140,4 +140,4 @@
# define HAS_MALLOC_CHECK_ # define HAS_MALLOC_CHECK_
#endif #endif
#endif /*__SysDefs__*/ #endif /*NUFXLIB_SYSDEFS_H*/

View File

@ -6,8 +6,8 @@
* Misc stuff (shared between nufxlib and nulib2). This is a collection * Misc stuff (shared between nufxlib and nulib2). This is a collection
* of miscellaneous types and macros that I find generally useful. * of miscellaneous types and macros that I find generally useful.
*/ */
#ifndef __MiscStuff__ #ifndef NULIB2_MISCSTUFF_H
#define __MiscStuff__ #define NULIB2_MISCSTUFF_H
#define VALGRIND /* assume we're using it */ #define VALGRIND /* assume we're using it */
@ -102,4 +102,4 @@ typedef unsigned char Boolean;
#define kInvalidPtr ((void*)0xa3a3a3a3) #define kInvalidPtr ((void*)0xa3a3a3a3)
#endif /*__MiscStuff__*/ #endif /*NULIB2_MISCSTUFF_H*/

View File

@ -4,8 +4,8 @@
* This is free software; you can redistribute it and/or modify it under the * This is free software; you can redistribute it and/or modify it under the
* terms of the BSD License, see the file COPYING. * terms of the BSD License, see the file COPYING.
*/ */
#ifndef __Nulib2__ #ifndef NULIB2_NULIB2_H
#define __Nulib2__ #define NULIB2_NULIB2_H
#include "SysDefs.h" /* system-dependent defs; must come first */ #include "SysDefs.h" /* system-dependent defs; must come first */
#include <NufxLib.h> #include <NufxLib.h>
@ -110,4 +110,4 @@ NuError AddFile(NulibState* pState, NuArchive* pArchive,
NuError Mkdir(const char* dir); NuError Mkdir(const char* dir);
NuError TestFileExistence(const char* fileName, Boolean* pIsDir); NuError TestFileExistence(const char* fileName, Boolean* pIsDir);
#endif /*__Nulib2__*/ #endif /*NULIB2_NULIB2_H*/

View File

@ -4,8 +4,8 @@
* This is free software; you can redistribute it and/or modify it under the * This is free software; you can redistribute it and/or modify it under the
* terms of the BSD License, see the file COPYING. * terms of the BSD License, see the file COPYING.
*/ */
#ifndef __State__ #ifndef NULIB2_STATE_H
#define __State__ #define NULIB2_STATE_H
#include "MiscStuff.h" #include "MiscStuff.h"
#include "NufxLib.h" #include "NufxLib.h"
@ -154,4 +154,4 @@ void NState_SetModPreserveType(NulibState* pState, Boolean val);
Boolean NState_GetModPreserveTypeExtended(const NulibState* pState); Boolean NState_GetModPreserveTypeExtended(const NulibState* pState);
void NState_SetModPreserveTypeExtended(NulibState* pState, Boolean val); void NState_SetModPreserveTypeExtended(NulibState* pState, Boolean val);
#endif /*__State__*/ #endif /*NULIB2_STATE_H*/

View File

@ -8,8 +8,8 @@
* (such as gcc) is used. The system header files aren't quite sufficient * (such as gcc) is used. The system header files aren't quite sufficient
* to eliminate hordes of warnings. * to eliminate hordes of warnings.
*/ */
#ifndef __SunOS4__ #ifndef NULIB2_SUNOS4_H
#define __SunOS4__ #define NULIB2_SUNOS4_H
#ifdef __GNUC__ #ifdef __GNUC__
extern int _flsbuf(int, FILE*); extern int _flsbuf(int, FILE*);
@ -43,4 +43,4 @@ extern int toupper(int);
extern int vfprintf(FILE*, const char *, va_list); extern int vfprintf(FILE*, const char *, va_list);
extern char* vsprintf(char *str, const char *format, va_list ap); extern char* vsprintf(char *str, const char *format, va_list ap);
#endif /*__SunOS4__*/ #endif /*NULIB2_SUNOS4_H*/

View File

@ -6,8 +6,8 @@
* *
* This was adapted from gzip's "tailor.h" and NuLib's "nudefs.h". * This was adapted from gzip's "tailor.h" and NuLib's "nudefs.h".
*/ */
#ifndef __SysDefs__ #ifndef NULIB2_SYSDEFS_H
#define __SysDefs__ #define NULIB2_SYSDEFS_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -208,4 +208,4 @@
# define MAX_PATH_LEN 1024 # define MAX_PATH_LEN 1024
#endif #endif
#endif /*__SysDefs__*/ #endif /*NULIB2_SYSDEFS_H*/