From fc294ddce9d387acb93d90681c5ddc44afa47d0f Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Sun, 15 Jun 2003 16:40:15 +0000 Subject: [PATCH] Remove some duplicates in globals.h git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@594 6ac86273-5f31-0410-b378-82cca8765d1b --- kernel/globals.h | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/kernel/globals.h b/kernel/globals.h index 2ec43b7..b67a8c5 100644 --- a/kernel/globals.h +++ b/kernel/globals.h @@ -178,20 +178,10 @@ extern struct ClockRecord /* */ /* Global variables */ /* */ -GLOBAL BYTE os_major, /* major version number */ +extern BYTE os_major, /* major version number */ os_minor, /* minor version number */ - rev_number /* minor version number */ -#ifdef MAIN - = REV_NUMBER, -#else - , -#endif - version_flags /* minor version number */ -#ifdef MAIN - = 0; -#else - ; -#endif + rev_number, /* minor version number */ + version_flags; /* minor version number */ #ifdef DEBUG GLOBAL WORD bDumpRegs @@ -313,9 +303,9 @@ extern BYTE ASM default_drive; /* default drive for dos */ extern dmatch ASM sda_tmp_dm; /* Temporary directory match buffer */ extern BYTE - FAR ASM internal_data[], /* sda areas */ - FAR ASM swap_always[], /* " " */ - FAR ASM swap_indos[], /* " " */ + ASM internal_data[], /* sda areas */ + ASM swap_always[], /* " " */ + ASM swap_indos[], /* " " */ ASM tsr, /* true if program is TSR */ ASM break_flg, /* true if break was detected */ ASM break_ena; /* break enabled flag */ @@ -354,9 +344,8 @@ GLOBAL WORD dump_regs; /* dump registers of bad call */ #endif -GLOBAL f_node_ptr f_nodes; /* pointer to the array */ - -GLOBAL UWORD f_nodes_cnt; /* number of allocated f_nodes */ +extern f_node_ptr f_nodes; /* pointer to the array */ +extern UWORD f_nodes_cnt; /* number of allocated f_nodes */ /* */ /* Function prototypes - automatically generated */