build fix for NODUMPENUMS and more issue #916
I made more things in dump_enums() static and/or const. In the process I discovered both compile problems for NODUMPENUMS and when fixed, link problems for NODUMPENUMS+ENHANCED_SYMBOLS. The uft8map.c portion has no changes, just reformatting.
This commit is contained in:
@@ -277,6 +277,9 @@
|
||||
* uncommented to define NODUMPENUMS. Doing so will disable the
|
||||
* nethack --dumpenums
|
||||
* command line option.
|
||||
* Note: the extra memory is also used by when ENHANCED_SYMBOLS is
|
||||
* defined, so defining both ENHANCED_SYMBOLS and NODUMPENUMS will limit
|
||||
* the amount of memory and code reduction offered by the latter.
|
||||
*/
|
||||
/* #define NODUMPENUMS */
|
||||
|
||||
|
||||
@@ -437,15 +437,16 @@ struct breadcrumbs {
|
||||
E const char *ARGV0;
|
||||
#endif
|
||||
|
||||
enum earlyarg {ARG_DEBUG, ARG_VERSION, ARG_SHOWPATHS
|
||||
enum earlyarg {
|
||||
ARG_DEBUG, ARG_VERSION, ARG_SHOWPATHS
|
||||
#ifndef NODUMPENUMS
|
||||
, ARG_DUMPENUMS
|
||||
#endif
|
||||
#ifdef ENHANCED_SYMBOLS
|
||||
, ARG_DUMPGLYPHIDS
|
||||
#endif
|
||||
#endif /* NODUMPENUMS */
|
||||
#ifdef WIN32
|
||||
,ARG_WINDOWS
|
||||
, ARG_WINDOWS
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -28,9 +28,6 @@ extern void welcome(boolean);
|
||||
extern int argcheck(int, char **, enum earlyarg);
|
||||
extern long timet_to_seconds(time_t);
|
||||
extern long timet_delta(time_t, time_t);
|
||||
#ifndef NODUMPENUMS
|
||||
extern void dump_enums(void);
|
||||
#endif
|
||||
|
||||
/* ### apply.c ### */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user