0
0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-10-10 00:25:06 -04:00

Merge remote-tracking branch 'github/nasm-2.15.xx'

This commit is contained in:
H. Peter Anvin (Intel)
2020-07-02 20:44:57 -07:00
7 changed files with 7 additions and 28 deletions

View File

@@ -310,27 +310,6 @@ static inline void *mempcpy(void *dst, const void *src, size_t n)
#define printf_func(fmt, list) format_func3(printf,fmt,list)
#define printf_func_ptr(fmt, list) format_func3_ptr(printf,fmt,list)
/*
* A static [inline] function which either is currently unused but
* likely to be used in the future, or used only under some #if
* combinations. Mark with this option to suppress compiler
* warnings.
*
* This is better than #if(def) because it still lets the compiler
* analyze the function for validity, and it works even for the
* conditional use case.
*
* The macro UNUSED is set to 1 if the unused macro is meaningful,
* otherwise 0; this may be useful in some #if statements.
*/
#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
# define unused __attribute__((unused))
# define UNUSED 1
#else
# define unused
# define UNUSED 0
#endif
/* Determine probabilistically if something is a compile-time constant */
#ifdef HAVE___BUILTIN_CONSTANT_P
# if defined(__GNUC__) && (__GNUC__ >= 5)

View File

@@ -77,7 +77,7 @@ static inline size_t strlist_size(const struct strlist *list)
return list ? list->size : 0;
}
struct strlist safe_alloc *strlist_alloc(bool uniq);
struct strlist * safe_alloc strlist_alloc(bool uniq);
const struct strlist_entry *strlist_add(struct strlist *list, const char *str);
const struct strlist_entry * printf_func(2, 3)
strlist_printf(struct strlist *list, const char *fmt, ...);