mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-18 16:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

compiler.h: correctly handle HAVE_DECL_*, test HAVE_DECL_STRNLEN

Browse Source 
HAVE_DECL_* are 0/1 not ifdef; use HAVE_DECL_STRNLEN to see if we need
to declare this, lest stdlib/strnlen.c fails to compile.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-02-23 19:23:10 -08:00
parent bc18af18f0
commit 2958bcc6c2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/compiler.h
View File

@ -104,7 +104,7 @@ int vsnprintf(char *, size_t, const char *, va_list);
# endif # endif
#endif #endif
#if !defined(HAVE_STRLCPY) || !defined(HAVE_DECL_STRLCPY) #if !defined(HAVE_STRLCPY) || !HAVE_DECL_STRLCPY
size_t strlcpy(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t);
#endif #endif
@ -136,26 +136,30 @@ typedef enum bool { false, true } bool;
#endif #endif
/* Some misguided platforms hide the defs for these */ /* Some misguided platforms hide the defs for these */
#if defined(HAVE_STRCASECMP) && !defined(HAVE_DECL_STRCASECMP) #if defined(HAVE_STRCASECMP) && !HAVE_DECL_STRCASECMP
int strcasecmp(const char *, const char *); int strcasecmp(const char *, const char *);
#endif #endif
#if defined(HAVE_STRICMP) && !defined(HAVE_DECL_STRICMP) #if defined(HAVE_STRICMP) && !HAVE_DECL_STRICMP
int stricmp(const char *, const char *); int stricmp(const char *, const char *);
#endif #endif
#if defined(HAVE_STRNCASECMP) && !defined(HAVE_DECL_STRNCASECMP) #if defined(HAVE_STRNCASECMP) && !HAVE_DECL_STRNCASECMP
int strncasecmp(const char *, const char *, size_t); int strncasecmp(const char *, const char *, size_t);
#endif #endif
#if defined(HAVE_STRNICMP) && !defined(HAVE_DECL_STRNICMP) #if defined(HAVE_STRNICMP) && !HAVE_DECL_STRNICMP
int strnicmp(const char *, const char *, size_t); int strnicmp(const char *, const char *, size_t);
#endif #endif
#if defined(HAVE_STRSEP) && !defined(HAVE_DECL_STRSEP) #if defined(HAVE_STRSEP) && !HAVE_DECL_STRSEP
char *strsep(char **, const char *); char *strsep(char **, const char *);
#endif #endif
#if !HAVE_DECL_STRNLEN
size_t strnlen(const char *s, size_t maxlen);
#endif
/* /*
* Define this to 1 for faster performance if this is a littleendian * Define this to 1 for faster performance if this is a littleendian
* platform which can do unaligned memory references. It is safe * platform which can do unaligned memory references. It is safe