drop global.h, clean config.h

src/actions.c

@@ -4,7 +4,7 @@
 /* #define DEBUG_CONFIG 1 */
 /* #define DEBUG_ID 1 */
 
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/append.h

@@ -1,7 +1,7 @@
 #ifndef _APPEND_H
 #define _APPEND_H 1
 
-#include "global.h"
+#include "config.h"
 
 extern char* append_str( char* buf, const char* string );
 extern char* append_tab( char* buf );

src/checkrom.c

@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "config.h"
 #include "romio.h"
 
 unsigned char* rom;

src/config.h

@@ -1,11 +1,8 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+#define _GNU_SOURCE
 
-/* Date program was compiled */
-#define COMPILE_TIME "Wed Apr 26 16:25:06 CEST 2023"
-
-/* description */
-#define COMPILE_VERSION 0
+#if defined( linux )
+#  define LINUX 1
+#endif
 
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
@@ -22,9 +19,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the `GL' library (-lGL). */
-/* #undef HAVE_LIBGL */
-
 /* Define to 1 if you have the `history' library (-lhistory). */
 #define HAVE_LIBHISTORY 1
 
@@ -53,10 +47,6 @@
 /* Define to 1 if you have the `select' function. */
 #define HAVE_SELECT 1
 
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -112,49 +102,13 @@
    slash. */
 #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 
-/* Name of package */
-#define PACKAGE "x48"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "x48-bugs@gam3.net"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "x48"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "x48 0.6.4"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "x48"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.6.4"
-
-/* The patch level */
-#define PATCHLEVEL 4
-
-/* Define to the type of arg 1 for `select'. */
-#define SELECT_TYPE_ARG1 int
-
-/* Define to the type of args 2, 3 and 4 for `select'. */
-#define SELECT_TYPE_ARG234 ( fd_set* )
-
-/* Define to the type of arg 5 for `select'. */
-#define SELECT_TYPE_ARG5 ( struct timeval* )
-
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Version number of package */
-#define VERSION "0.6.4"
+// /* Version number of package */
+// #define VERSION "0.6.4"
 
 /* The major version number */
 #define VERSION_MAJOR 0
@@ -162,20 +116,5 @@
 /* The minor version number */
 #define VERSION_MINOR 6
 
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
+/* The patch level */
+#define PATCHLEVEL 4

src/debugger.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #ifdef HAVE_READLINE

src/debugger.h

@@ -1,7 +1,7 @@
 #ifndef _DEBUGGER_H
 #define _DEBUGGER_H 1
 
-#include "global.h"
+#include "config.h"
 #include "hp48.h"
 
 #define USER_INTERRUPT 1

src/device.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdlib.h>
 

src/device.h

@@ -1,7 +1,7 @@
 #ifndef _DEVICE_H
 #define _DEVICE_H 1
 
-#include "global.h"
+#include "config.h"
 #include "hp48.h"
 
 #define DISP_INSTR_OFF 0x10

src/disasm.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/disasm.h

@@ -1,7 +1,7 @@
 #ifndef _DISASM_H
 #define _DISASM_H 1
 
-#include "global.h"
+#include "config.h"
 #include "hp48.h"
 
 #define HP_MNEMONICS 0

src/dump2rom.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/emulate.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 

src/errors.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "global.h"
+#include "config.h"
 #include "resources.h"
 
 char errbuf[ 1024 ] = {

src/errors.h

@@ -1,7 +1,7 @@
 #ifndef _ERRORS_H
 #define _ERRORS_H
 
-#include "global.h"
+#include "config.h"
 
 extern char errbuf[ 1024 ];
 extern char fixbuf[ 1024 ];

src/global.h

@@ -1,12 +0,0 @@
-#ifndef _GLOBAL_H
-#define _GLOBAL_H 1
-
-#define _GNU_SOURCE
-
-#include "config.h"
-
-#if defined( linux )
-#  define LINUX 1
-#endif
-
-#endif /* !_GLOBAL_H */

src/hp48.h

@@ -1,7 +1,7 @@
 #ifndef _HP48_H
 #define _HP48_H 1
 
-#include "global.h"
+#include "config.h"
 
 #include <sys/time.h>
 

src/hp48_emu.h

@@ -1,7 +1,7 @@
 #ifndef _HP48_EMU_H
 #define _HP48_EMU_H 1
 
-#include "global.h"
+#include "config.h"
 
 #include <X11/Xlib.h>
 

src/init.c

@@ -170,7 +170,7 @@ void saturn_config_init( void ) {
     saturn.version[ 0 ] = VERSION_MAJOR;
     saturn.version[ 1 ] = VERSION_MINOR;
     saturn.version[ 2 ] = PATCHLEVEL;
-    saturn.version[ 3 ] = COMPILE_VERSION;
+    // saturn.version[ 3 ] = COMPILE_VERSION;
     memset( &device, 0, sizeof( device ) );
     device.display_touched = 1;
     device.contrast_touched = 1;
@@ -193,7 +193,7 @@ void init_saturn( void ) {
     saturn.version[ 0 ] = VERSION_MAJOR;
     saturn.version[ 1 ] = VERSION_MINOR;
     saturn.version[ 2 ] = PATCHLEVEL;
-    saturn.version[ 3 ] = COMPILE_VERSION;
+    // saturn.version[ 3 ] = COMPILE_VERSION;
     saturn.hexmode = HEX;
     saturn.rstkp = -1;
     saturn.intenable = 1;
@@ -1077,7 +1077,7 @@ int read_files( void ) {
             saturn.version[ 0 ] = VERSION_MAJOR;
             saturn.version[ 1 ] = VERSION_MINOR;
             saturn.version[ 2 ] = PATCHLEVEL;
-            saturn.version[ 3 ] = COMPILE_VERSION;
+            // saturn.version[ 3 ] = COMPILE_VERSION;
         } else {
             /*
              * no, initialize
@@ -1107,7 +1107,7 @@ int read_files( void ) {
             v2 = ( ( int )VERSION_MAJOR & 0xff ) << 24;
             v2 |= ( ( int )VERSION_MINOR & 0xff ) << 16;
             v2 |= ( ( int )PATCHLEVEL & 0xff ) << 8;
-            v2 |= ( ( int )COMPILE_VERSION & 0xff );
+            // v2 |= ( ( int )COMPILE_VERSION & 0xff );
 
             if ( ( v1 & 0xffffff00 ) < ( v2 & 0xffffff00 ) ) {
                 if ( !quiet )

src/lcd.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>

src/memory.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/mkcard.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/options.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/options.h

@@ -1,7 +1,7 @@
 #ifndef _OPTIONS_H
 #define _OPTIONS_H 1
 
-#include "global.h"
+#include "config.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>

src/register.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/resources.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>

src/resources.h

@@ -1,7 +1,7 @@
 #ifndef _RESOURCES_H
 #define _RESOURCES_H 1
 
-#include "global.h"
+#include "config.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>

src/romio.c

@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "config.h"
 #include "resources.h"
 #include "romio.h"
 

src/romio.h

@@ -1,7 +1,7 @@
 #ifndef _ROMIO_H
 #define _ROMIO_H 1
 
-#include "global.h"
+#include "config.h"
 
 #define ROM_SIZE_SX 0x080000
 #define ROM_SIZE_GX 0x100000

src/rpl.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/rpl.h

@@ -1,7 +1,7 @@
 #ifndef _RPL_H
 #define _RPL_H 1
 
-#include "global.h"
+#include "config.h"
 #include "hp48.h"
 
 /*

src/serial.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>

src/timer.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/timer.h

@@ -1,7 +1,7 @@
 #ifndef _TIMER_H
 #define _TIMER_H 1
 
-#include "global.h"
+#include "config.h"
 #include "hp48.h"
 
 #define NR_TIMERS 4

src/x48_gui.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "config.h"
 
 #include <fcntl.h>
 #include <pwd.h>

src/x48_gui.h

@@ -1,7 +1,7 @@
 #ifndef _X48_GUI_H
 #define _X48_GUI_H 1
 
-#include "global.h"
+#include "config.h"
 
 #include <X11/Xlib.h>
 #ifdef HAVE_XSHM