diff options
| author | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
| commit | 0ab52ac65bdba93be94e4149e267698d31b41d72 (patch) | |
| tree | e7f0cd0d549c8a04a35693cc98b6b27c06eeb2ed /src/common/strlib.h | |
| parent | 94657284973f4037596bae468ebfbee5c217e02b (diff) | |
| download | hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.gz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.bz2 hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.xz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.zip | |
Re-commit of "Fixed order of includes in all source files"
This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.
Diffstat (limited to 'src/common/strlib.h')
| -rw-r--r-- | src/common/strlib.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h index 10844d257..decf661a6 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -5,15 +5,16 @@ #ifndef _COMMON_STRLIB_H_ #define _COMMON_STRLIB_H_ -#include "../common/cbasetypes.h" #include <stdarg.h> +#include "../common/cbasetypes.h" + #ifndef __USE_GNU - #define __USE_GNU // required to enable strnlen on some platforms - #include <string.h> - #undef __USE_GNU +# define __USE_GNU // required to enable strnlen on some platforms +# include <string.h> +# undef __USE_GNU #else - #include <string.h> +# include <string.h> #endif #ifdef WIN32 @@ -165,7 +166,7 @@ struct sv_interface *sv; void strlib_defaults(void); /* the purpose of these macros is simply to not make calling them be an annoyance */ -#ifndef STRLIB_C +#ifndef _H_STRLIB_C_ #define jstrescape(pt) (strlib->jstrescape(pt)) #define jstrescapecpy(pt,spt) (strlib->jstrescapecpy((pt),(spt))) #define jmemescapecpy(pt,spt,size) (strlib->jmemescapecpy((pt),(spt),(size))) @@ -189,6 +190,6 @@ void strlib_defaults(void); #define safesnprintf(buf,sz,fmt,...) (strlib->safesnprintf((buf),(sz),(fmt),##__VA_ARGS__)) #define strline(str,pos) (strlib->strline((str),(pos))) #define bin2hex(output,input,count) (strlib->bin2hex((output),(input),(count))) -#endif /* STRLIB_C */ +#endif /* _H_STRLIB_C_ */ #endif /* _COMMON_STRLIB_H_ */ |