From cbde75bbe7c4a74506437f14b33dd94f8ad15b5a Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sat, 18 Jan 2014 18:36:06 -0200 Subject: Modified strlib interface to be compliant with hpmhooks aka no #ifdef within the interface. Thanks to Haruna. Signed-off-by: shennetsind --- src/common/strlib.h | 8 +++----- 1 file 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); -- cgit v1.2.3-60-g2f50