summaryrefslogtreecommitdiff
path: root/src/common/strlib.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-07-10 16:59:55 +0200
committerHaru <haru@dotalux.com>2014-07-11 08:47:27 +0200
commit68e7f53f05dd80e8b4ab9d84c9931df22a6b060c (patch)
tree5b3d0f0b2f7aad19735b16c8a443a9534d0f5224 /src/common/strlib.h
parent8b4f35532c8fd7c7f0939756923fdaf14ee39531 (diff)
downloadhercules-68e7f53f05dd80e8b4ab9d84c9931df22a6b060c.tar.gz
hercules-68e7f53f05dd80e8b4ab9d84c9931df22a6b060c.tar.bz2
hercules-68e7f53f05dd80e8b4ab9d84c9931df22a6b060c.tar.xz
hercules-68e7f53f05dd80e8b4ab9d84c9931df22a6b060c.zip
Fixed reserved __identifier violations
- Complies with CERT DCL37-C - Fixes issue #293 (special thanks to elfring) Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/strlib.h')
-rw-r--r--src/common/strlib.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f39f27789..7f84d2893 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -2,8 +2,8 @@
// See the LICENSE file
// Portions Copyright (c) Athena Dev Teams
-#ifndef _COMMON_STRLIB_H_
-#define _COMMON_STRLIB_H_
+#ifndef COMMON_STRLIB_H
+#define COMMON_STRLIB_H
#include <stdarg.h>
#include <string.h>
@@ -12,8 +12,8 @@
#ifdef WIN32
#define HAVE_STRTOK_R
- #define strtok_r(s,delim,save_ptr) _strtok_r((s),(delim),(save_ptr))
- char *_strtok_r(char* s1, const char* s2, char** lasts);
+ #define strtok_r(s,delim,save_ptr) strtok_r_((s),(delim),(save_ptr))
+ char *strtok_r_(char* s1, const char* s2, char** lasts);
#endif
/// Bitfield determining the behavior of sv_parse and sv_split.
@@ -159,7 +159,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 _H_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)))
@@ -183,6 +183,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 /* _H_STRLIB_C_ */
+#endif /* H_STRLIB_C */
-#endif /* _COMMON_STRLIB_H_ */
+#endif /* COMMON_STRLIB_H */