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

7 files changed, 7 insertions, 28 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index d0272b2b..a22b2cbe 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -409,7 +409,7 @@ MKDEP=0
 #-- Magic hints to mkdep.pl --#
 # @object-ending: ".$(O)"
 # @path-separator: "\"
-# @exclude: "config\config.h"
+# @exclude: "config/config.h"
 # @external: "msvc.dep"
 # @selfrule: "1"
 #-- Everything below is generated by mkdep.pl - do not edit --#
diff --git a/README.md b/README.md
index 704fba14..e9b3dc30 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,5 @@ This means its development is open to even wider society of programmers
 wishing to improve their lovely assembler.
 
 Visit our [nasm.us](https://www.nasm.us/) website for more details.
-We are gradually moving services away from Sourceforge. For our remaining
-Sourceforge services see [here](https://sourceforge.net/projects/nasm/).
 
 With best regards, the NASM crew.
diff --git a/asm/parser.c b/asm/parser.c
index 7c24cc00..47b46ecd 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -234,7 +234,7 @@ static bool parse_braces(decoflags_t *decoflags)
     }
 }
 
-static inline unused
+static inline unused_func
 const expr *next_expr(const expr *e, const expr **next_list)
 {
     e++;
diff --git a/asm/preproc.c b/asm/preproc.c
index 22bccfcc..116ceef6 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -345,7 +345,7 @@ static inline bool tok_text_match(const struct Token *a, const struct Token *b)
     return a->len == b->len && !memcmp(tok_text(a), tok_text(b), a->len);
 }
 
-static inline unused bool
+static inline unused_func bool
 tok_match(const struct Token *a, const struct Token *b)
 {
     return a->type == b->type && tok_text_match(a, b);
@@ -764,7 +764,7 @@ static const char *unquote_token_cstr(Token *t)
  * TOK_STRING tokens.
  */
 static Token *quote_any_token(Token *t);
-static inline unused
+static inline unused_func
 Token *quote_token(Token *t)
 {
     if (likely(!tok_is(t, TOK_INTERNAL_STRING)))
diff --git a/doc/changes.src b/doc/changes.src
index f33e3ce4..e4bd3edf 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -13,6 +13,8 @@ since 2007.
 
 \b Add \c{db-empty} warning class, see \k{opt-w}.
 
+\b Fix the dependencies in the MSVC NMAKE makefile (\c{Mkfiles/msvc.mak}).
+
 \b Some documentation improvements and cleanups.
 
 \b Fix the handling of macro parameter ranges (\c{%\{:\}}), including
diff --git a/include/compiler.h b/include/compiler.h
index a1905d27..a1c1b0db 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -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)
diff --git a/include/strlist.h b/include/strlist.h
index f1775abd..25681c59 100644
--- a/include/strlist.h
+++ b/include/strlist.h
@@ -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, ...);