diff --git a/sys/vms/Makefile_src.vms b/sys/vms/Makefile_src.vms index 5123dfe4c..334145b22 100644 --- a/sys/vms/Makefile_src.vms +++ b/sys/vms/Makefile_src.vms @@ -319,7 +319,7 @@ hacklib.olb: $(HACKLIBOBJLIST) $(INCL)nhlua.h: echo "/* nhlua.h - generated by Makefile.vms */" > $@ @echo \#"include ""$(LUASRCINCDIR)lua.h""" >> $@ - @echo "LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ + @echo "ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ @echo \#"include ""$(LUASRCINCDIR)lualib.h""" >> $@ @echo \#"include ""$(LUASRCINCDIR)lauxlib.h""" >> $@ @echo "/*nhlua.h*/" >> $@ @@ -327,7 +327,7 @@ $(INCL)nhlua.h: #$(INCL)nhlua.h: # echo "/* nhlua.h - generated by -vms9 */" > $@ # @echo \#"include ""sys$$common:[lua.include]lua.h""" >> $@ -# @echo "LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ +# @echo "ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ # @echo \#"include ""sys$$common:[lua.include]lualib.h""" >> $@ # @echo \#"include ""sys$$common:[lua.include]lauxlib.h""" >> $@ # @echo "/*nhlua.h*/" >> $@ diff --git a/sys/vms/Makefile_top.vms b/sys/vms/Makefile_top.vms index 505b797b0..7a28ff098 100644 --- a/sys/vms/Makefile_top.vms +++ b/sys/vms/Makefile_top.vms @@ -314,7 +314,7 @@ dofiles-nodlb: $(INCL)nhlua.h: echo "/* nhlua.h - generated by top-level Makefile.vms */" > $@ @echo \#"include ""lua.h""" >> $@ - @echo "LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ + @echo "ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ @echo \#"include ""lualib.h""" >> $@ @echo \#"include ""lauxlib.h""" >> $@ @echo "/*nhlua.h*/" >> $@ diff --git a/sys/vms/vmsbuild.com b/sys/vms/vmsbuild.com index b9f8cc721..737fbf015 100755 --- a/sys/vms/vmsbuild.com +++ b/sys/vms/vmsbuild.com @@ -377,7 +377,7 @@ $ set file/att=(RFM:STM) [-.include]nhlua.h $ open/Append f [-.include]nhlua.h $ write f "/* nhlua.h - generated by vmsbuild.com */" $ write f "#include ""[-.lib.lua''luaver'.src]lua.h""" -$ write f "LUA_API int (lua_error) (lua_State *L) NORETURN;" +$ write f "ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN;" $ write f "#include ""[-.lib.lua''luaver'.src]lualib.h""" $ write f "#include ""[-.lib.lua''luaver'.src]lauxlib.h""" $ write f "/*nhlua.h*/" diff --git a/sys/vms/vmsmisc.c b/sys/vms/vmsmisc.c index 2c1226174..fa705161c 100644 --- a/sys/vms/vmsmisc.c +++ b/sys/vms/vmsmisc.c @@ -16,8 +16,8 @@ int debuggable = 0; /* 1 if we can debug or show a call trace */ -ATTRNORETURN void vms_exit(int); -ATTRNORETURN void vms_abort(void); +ATTRNORETURN void vms_exit(int) NORETURN; +ATTRNORETURN void vms_abort(void) NORETURN; /* first arg should be unsigned long but has unsigned int */ diff --git a/sys/windows/GNUmakefile b/sys/windows/GNUmakefile index 3253e195e..8ba1ee4b2 100644 --- a/sys/windows/GNUmakefile +++ b/sys/windows/GNUmakefile @@ -435,7 +435,7 @@ NHLUAH = $(INCL)/nhlua.h $(NHLUAH): echo "/* nhlua.h - generated by GNUmakefile */" > $@ @echo "#include \"$(LUASRC)/lua.h\"" >> $@ - @echo "LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ + @echo "ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN;" >>$@ @echo "#include \"$(LUASRC)/lualib.h\"" >> $@ @echo "#include \"$(LUASRC)/lauxlib.h\"" >> $@ @echo "/*nhlua.h*/" >> $@ diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index e8d97fd09..f63336683 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -1769,7 +1769,7 @@ $(OUTL)utility.tag: $(INCL)nhlua.h outldir$(TARGET_CPU).tag $(OUTLHACKLIB) $(U)t $(INCL)nhlua.h: @echo /* nhlua.h - generated by Makefile from Makefile.nmake */ > $@ @echo #include "lua.h" >> $@ - @echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ + @echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ @echo #include "lualib.h" >> $@ @echo #include "lauxlib.h" >> $@ @echo /*nhlua.h*/ >> $@ diff --git a/sys/windows/vs/FetchPrereq/fetchprereq.nmake b/sys/windows/vs/FetchPrereq/fetchprereq.nmake index 3b0ea1b8c..07c62dbb6 100644 --- a/sys/windows/vs/FetchPrereq/fetchprereq.nmake +++ b/sys/windows/vs/FetchPrereq/fetchprereq.nmake @@ -59,7 +59,7 @@ fetch-pdcurses: ..\..\..\..\include\nhlua.h: @echo /* nhlua.h - generated by Makefile from fetchprereq.nmake */ > $@ @echo #include "lua.h" >> $@ - @echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ + @echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ @echo #include "lualib.h" >> $@ @echo #include "lauxlib.h" >> $@ @echo /*nhlua.h*/ >> $@ diff --git a/sys/windows/vs/hacklib/hacklib.vcxproj b/sys/windows/vs/hacklib/hacklib.vcxproj index 3be14bb62..23b673271 100644 --- a/sys/windows/vs/hacklib/hacklib.vcxproj +++ b/sys/windows/vs/hacklib/hacklib.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/sys/windows/vs/lualib/lualib.vcxproj b/sys/windows/vs/lualib/lualib.vcxproj index 537be7191..13c01453e 100644 --- a/sys/windows/vs/lualib/lualib.vcxproj +++ b/sys/windows/vs/lualib/lualib.vcxproj @@ -471,7 +471,7 @@ - + diff --git a/util/sfctool.c b/util/sfctool.c index de25963a4..f568a793f 100644 --- a/util/sfctool.c +++ b/util/sfctool.c @@ -90,10 +90,10 @@ int util_strncmpi(const char *s1, const char *s2, size_t sz); #ifdef UNIX #define nethack_exit exit -void nh_terminate(int) NORETURN; /* bwrite() calls this */ +ATTRNORETURN void nh_terminate(int) NORETURN; /* bwrite() calls this */ static void chdirx(const char *); #else -extern void nethack_exit(int) NORETURN; +ATTRNORETURN extern void nethack_exit(int) NORETURN; #ifdef WIN32 boolean get_user_home_folder(char *homebuf, size_t sz); int GUILaunched;