summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-18 18:36:06 -0200
committershennetsind <ind@henn.et>2014-01-18 18:36:06 -0200
commitcbde75bbe7c4a74506437f14b33dd94f8ad15b5a (patch)
tree8aa5662eddb5967814b4b36c6b3d0ba560926bff
parenta9cc02e1dea69e14a1b1e3d1cf27aaa271ac0b4b (diff)
downloadhercules-cbde75bbe7c4a74506437f14b33dd94f8ad15b5a.tar.gz
hercules-cbde75bbe7c4a74506437f14b33dd94f8ad15b5a.tar.bz2
hercules-cbde75bbe7c4a74506437f14b33dd94f8ad15b5a.tar.xz
hercules-cbde75bbe7c4a74506437f14b33dd94f8ad15b5a.zip
Modified strlib interface to be compliant with hpmhooks
aka no #ifdef within the interface. Thanks to Haruna. Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/common/strlib.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 0c3b0a486..d1aea8cac 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -70,13 +70,11 @@ struct strlib_interface {
char *(*normalize_name) (char* str,const char* delims);
const char *(*stristr) (const char *haystack, const char *needle);
-#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN)
+ /* only used when '!(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN)', needs to be defined at all times however */
size_t (*strnlen) (const char* string, size_t maxlen);
-#endif
-
-#if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200
+
+ /* only used when 'defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200', needs to be defined at all times however */
uint64 (*strtoull) (const char* str, char** endptr, int base);
-#endif
int (*e_mail_check) (char* email);
int (*config_switch) (const char* str);