consistent ATTRNORETURN prefix and NORETURN suffix
This commit is contained in:
@@ -319,7 +319,7 @@ hacklib.olb: $(HACKLIBOBJLIST)
|
|||||||
$(INCL)nhlua.h:
|
$(INCL)nhlua.h:
|
||||||
echo "/* nhlua.h - generated by Makefile.vms */" > $@
|
echo "/* nhlua.h - generated by Makefile.vms */" > $@
|
||||||
@echo \#"include ""$(LUASRCINCDIR)lua.h""" >> $@
|
@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)lualib.h""" >> $@
|
||||||
@echo \#"include ""$(LUASRCINCDIR)lauxlib.h""" >> $@
|
@echo \#"include ""$(LUASRCINCDIR)lauxlib.h""" >> $@
|
||||||
@echo "/*nhlua.h*/" >> $@
|
@echo "/*nhlua.h*/" >> $@
|
||||||
@@ -327,7 +327,7 @@ $(INCL)nhlua.h:
|
|||||||
#$(INCL)nhlua.h:
|
#$(INCL)nhlua.h:
|
||||||
# echo "/* nhlua.h - generated by -vms9 */" > $@
|
# echo "/* nhlua.h - generated by -vms9 */" > $@
|
||||||
# @echo \#"include ""sys$$common:[lua.include]lua.h""" >> $@
|
# @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]lualib.h""" >> $@
|
||||||
# @echo \#"include ""sys$$common:[lua.include]lauxlib.h""" >> $@
|
# @echo \#"include ""sys$$common:[lua.include]lauxlib.h""" >> $@
|
||||||
# @echo "/*nhlua.h*/" >> $@
|
# @echo "/*nhlua.h*/" >> $@
|
||||||
|
|||||||
@@ -314,7 +314,7 @@ dofiles-nodlb:
|
|||||||
$(INCL)nhlua.h:
|
$(INCL)nhlua.h:
|
||||||
echo "/* nhlua.h - generated by top-level Makefile.vms */" > $@
|
echo "/* nhlua.h - generated by top-level Makefile.vms */" > $@
|
||||||
@echo \#"include ""lua.h""" >> $@
|
@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 ""lualib.h""" >> $@
|
||||||
@echo \#"include ""lauxlib.h""" >> $@
|
@echo \#"include ""lauxlib.h""" >> $@
|
||||||
@echo "/*nhlua.h*/" >> $@
|
@echo "/*nhlua.h*/" >> $@
|
||||||
|
|||||||
@@ -377,7 +377,7 @@ $ set file/att=(RFM:STM) [-.include]nhlua.h
|
|||||||
$ open/Append f [-.include]nhlua.h
|
$ open/Append f [-.include]nhlua.h
|
||||||
$ write f "/* nhlua.h - generated by vmsbuild.com */"
|
$ write f "/* nhlua.h - generated by vmsbuild.com */"
|
||||||
$ write f "#include ""[-.lib.lua''luaver'.src]lua.h"""
|
$ 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]lualib.h"""
|
||||||
$ write f "#include ""[-.lib.lua''luaver'.src]lauxlib.h"""
|
$ write f "#include ""[-.lib.lua''luaver'.src]lauxlib.h"""
|
||||||
$ write f "/*nhlua.h*/"
|
$ write f "/*nhlua.h*/"
|
||||||
|
|||||||
+2
-2
@@ -16,8 +16,8 @@
|
|||||||
|
|
||||||
int debuggable = 0; /* 1 if we can debug or show a call trace */
|
int debuggable = 0; /* 1 if we can debug or show a call trace */
|
||||||
|
|
||||||
ATTRNORETURN void vms_exit(int);
|
ATTRNORETURN void vms_exit(int) NORETURN;
|
||||||
ATTRNORETURN void vms_abort(void);
|
ATTRNORETURN void vms_abort(void) NORETURN;
|
||||||
|
|
||||||
/* first arg should be unsigned long but <lib$routines.h> has unsigned int */
|
/* first arg should be unsigned long but <lib$routines.h> has unsigned int */
|
||||||
|
|
||||||
|
|||||||
@@ -435,7 +435,7 @@ NHLUAH = $(INCL)/nhlua.h
|
|||||||
$(NHLUAH):
|
$(NHLUAH):
|
||||||
echo "/* nhlua.h - generated by GNUmakefile */" > $@
|
echo "/* nhlua.h - generated by GNUmakefile */" > $@
|
||||||
@echo "#include \"$(LUASRC)/lua.h\"" >> $@
|
@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)/lualib.h\"" >> $@
|
||||||
@echo "#include \"$(LUASRC)/lauxlib.h\"" >> $@
|
@echo "#include \"$(LUASRC)/lauxlib.h\"" >> $@
|
||||||
@echo "/*nhlua.h*/" >> $@
|
@echo "/*nhlua.h*/" >> $@
|
||||||
|
|||||||
@@ -1769,7 +1769,7 @@ $(OUTL)utility.tag: $(INCL)nhlua.h outldir$(TARGET_CPU).tag $(OUTLHACKLIB) $(U)t
|
|||||||
$(INCL)nhlua.h:
|
$(INCL)nhlua.h:
|
||||||
@echo /* nhlua.h - generated by Makefile from Makefile.nmake */ > $@
|
@echo /* nhlua.h - generated by Makefile from Makefile.nmake */ > $@
|
||||||
@echo #include "lua.h" >> $@
|
@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 "lualib.h" >> $@
|
||||||
@echo #include "lauxlib.h" >> $@
|
@echo #include "lauxlib.h" >> $@
|
||||||
@echo /*nhlua.h*/ >> $@
|
@echo /*nhlua.h*/ >> $@
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ fetch-pdcurses:
|
|||||||
..\..\..\..\include\nhlua.h:
|
..\..\..\..\include\nhlua.h:
|
||||||
@echo /* nhlua.h - generated by Makefile from fetchprereq.nmake */ > $@
|
@echo /* nhlua.h - generated by Makefile from fetchprereq.nmake */ > $@
|
||||||
@echo #include "lua.h" >> $@
|
@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 "lualib.h" >> $@
|
||||||
@echo #include "lauxlib.h" >> $@
|
@echo #include "lauxlib.h" >> $@
|
||||||
@echo /*nhlua.h*/ >> $@
|
@echo /*nhlua.h*/ >> $@
|
||||||
|
|||||||
@@ -172,7 +172,7 @@
|
|||||||
<Message Text="Generating $(IncDir)nhlua.h" />
|
<Message Text="Generating $(IncDir)nhlua.h" />
|
||||||
<Exec Command="echo /* nhlua.h - generated by hacklib.vcxproj ClCompile */ > nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo /* nhlua.h - generated by hacklib.vcxproj ClCompile */ > nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lua.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lua.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lualib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lualib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lauxlib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lauxlib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo /*nhlua.h*/ >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo /*nhlua.h*/ >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
|
|||||||
@@ -471,7 +471,7 @@
|
|||||||
<Message Text="Generating $(IncDir)nhlua.h" />
|
<Message Text="Generating $(IncDir)nhlua.h" />
|
||||||
<Exec Command="echo /* nhlua.h - generated by lualib.vcxproj ClCompile */ > nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo /* nhlua.h - generated by lualib.vcxproj ClCompile */ > nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lua.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lua.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lualib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lualib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo #include %22lauxlib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo #include %22lauxlib.h%22 >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
<Exec Command="echo /*nhlua.h*/ >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
<Exec Command="echo /*nhlua.h*/ >> nhlua.h" WorkingDirectory="$(IncDir)" />
|
||||||
|
|||||||
+2
-2
@@ -90,10 +90,10 @@ int util_strncmpi(const char *s1, const char *s2, size_t sz);
|
|||||||
|
|
||||||
#ifdef UNIX
|
#ifdef UNIX
|
||||||
#define nethack_exit exit
|
#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 *);
|
static void chdirx(const char *);
|
||||||
#else
|
#else
|
||||||
extern void nethack_exit(int) NORETURN;
|
ATTRNORETURN extern void nethack_exit(int) NORETURN;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
boolean get_user_home_folder(char *homebuf, size_t sz);
|
boolean get_user_home_folder(char *homebuf, size_t sz);
|
||||||
int GUILaunched;
|
int GUILaunched;
|
||||||
|
|||||||
Reference in New Issue
Block a user