Menu
▾
▴
[Freedos-cvs] freecom/lib alsysblk.c, 1.3, 1.4 dbg_c.c, 1.2, 1.3 dbg_mem.c, 1.4, 1.5 dbg_prnt.c, 1.2, 1.3 dbg_s.c, 1.2, 1.3 dbg_sn.c, 1.2, 1.3 lfnfuncs.c, 1.10, 1.11 messages.c, 1.7, 1.8 myperror.c, 1.1, 1.2 res.c, 1.2, 1.3 res_r.c, 1.7, 1.8 res_vald.c, 1.1, 1.2
|
From: Blair C. <bla...@us...> - 2006-09-11 00:07:29
|
Update of /cvsroot/freedos/freecom/lib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7332/lib Modified Files: alsysblk.c dbg_c.c dbg_mem.c dbg_prnt.c dbg_s.c dbg_sn.c lfnfuncs.c messages.c myperror.c res.c res_r.c res_vald.c Log Message: Fixed compilation completely with Turbo C Index: dbg_c.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/dbg_c.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dbg_c.c 1 Feb 2004 13:52:17 -0000 1.2 +++ dbg_c.c 11 Sep 2006 00:07:22 -0000 1.3 @@ -5,6 +5,9 @@ This file bases on DEBUG.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.3 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.2 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -36,10 +39,8 @@ #include "../config.h" -#include <stdio.h> +#ifdef DEBUG -#include "../include/debug.h" +void dbg_outc (int ch) { putc (ch, dbg_logfile); } -void dbg_outc(int ch) -{ putc(ch, dbg_logfile); -} +#endif /* DEBUG */ Index: myperror.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/myperror.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- myperror.c 2 Jul 2006 08:06:56 -0000 1.1 +++ myperror.c 11 Sep 2006 00:07:22 -0000 1.2 @@ -1,5 +1,7 @@ /* Smaller PERROR replacement for FreeCOM (only used in REN and DEL) */ +#include "../config.h" + #include <stdio.h> #include <stdlib.h> #include <errno.h> Index: alsysblk.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/alsysblk.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- alsysblk.c 29 Jun 2004 21:57:20 -0000 1.3 +++ alsysblk.c 11 Sep 2006 00:07:22 -0000 1.4 @@ -6,6 +6,9 @@ This file bases on MISC.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.4 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.3 2004/06/29 21:57:20 skaus fix: /LOW option @@ -40,20 +43,17 @@ #include "../config.h" -#include <assert.h> - -#include <mcb.h> -#include <suppl.h> +#include "mcb.h" +#include "suppl.h" #include "../include/misc.h" - unsigned allocSysBlk(const unsigned size, const unsigned mode) { unsigned segm; struct MCB _seg *mcb; if((segm = allocMemBlk(size, mode)) != 0) { - mcb = (struct MCB _seg*)SEG2MCB(segm); + mcb = MK_SEG_PTR (struct MCB, SEG2MCB (segm)); mcb->mcb_ownerPSP = 8; dprintf(("[MEM: allocated system memory block: %04x/%u]\n" , segm, size)); Index: dbg_sn.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/dbg_sn.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dbg_sn.c 1 Feb 2004 13:52:17 -0000 1.2 +++ dbg_sn.c 11 Sep 2006 00:07:22 -0000 1.3 @@ -5,6 +5,9 @@ This file bases on DEBUG.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.3 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.2 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -36,12 +39,11 @@ #include "../config.h" -#include <stdio.h> - -#include "../include/debug.h" +#ifdef DEBUG -void dbg_outsn(const char * const s) -{ if(s) fputs(s, dbg_logfile); - putc('\n', dbg_logfile); - fflush(dbg_logfile); +void dbg_outsn (const char *const s) { + if (s) fputs (s, dbg_logfile); + dbg_outs ("\n"); } + +#endif /* DEBUG */ Index: messages.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/messages.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- messages.c 29 Jun 2004 21:57:20 -0000 1.7 +++ messages.c 11 Sep 2006 00:07:22 -0000 1.8 @@ -8,6 +8,9 @@ This file bases on MESSAGES.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.8 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.7 2004/06/29 21:57:20 skaus fix: /LOW option @@ -96,18 +99,19 @@ /* Called if the resource locator found a resource with a matching major ID --> we ignore all the rest of IDs and probe for the validation string at the beginning of the resource data */ -#pragma argsused -static int loadStrings(res_majorid_t major - , res_minorid_t minor - , long length - , FILE* f - , void * const arg) -{ loadStatus *ls = arg; + +static int loadStrings (res_majorid_t major, + res_minorid_t minor, + long length, + FILE* f, + void *const arg) { + loadStatus *ls = arg; char fdid[sizeof(STRINGS_ID)]; string_size_t len, firstStr; string_index_t far*idx; int i; + (void)major, (void)minor; if((unsigned long)length >= 0x10000ul || (unsigned)length < STRINGS_HEADER_SIZE) { *ls = STRINGS_SIZE_MISMATCH; Index: lfnfuncs.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/lfnfuncs.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- lfnfuncs.c 4 Sep 2006 20:14:23 -0000 1.10 +++ lfnfuncs.c 11 Sep 2006 00:07:22 -0000 1.11 @@ -16,6 +16,7 @@ #include <suppl.h> #include <dfn.h> #include <sstr.h> +#include <io.h> #define __LFNFUNCS_C Index: res_r.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/res_r.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- res_r.c 4 Sep 2006 20:03:14 -0000 1.7 +++ res_r.c 11 Sep 2006 00:07:22 -0000 1.8 @@ -28,6 +28,9 @@ This file bases on OPENF.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.8 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.7 2006/09/04 20:03:14 blairdude Support compiler oddity (Arkady) @@ -75,12 +78,9 @@ #include "../config.h" #include <assert.h> -#include <io.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> +#include <string.h> /* memcmp */ +#include <io.h> /* filelength */ -#include "../include/debug.h" #include "../include/resource.h" int enumFileResources(const char *const fnam Index: res.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/res.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- res.c 1 Feb 2004 13:52:17 -0000 1.2 +++ res.c 11 Sep 2006 00:07:22 -0000 1.3 @@ -30,6 +30,9 @@ This file bases on OPENF.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.3 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.2 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -61,12 +64,7 @@ #include "../config.h" -#include <assert.h> -#include <stdio.h> -#include <string.h> - #include "../include/resource.h" -#include "../include/debug.h" #include "../include/command.h" int enumResources(res_majorid_t id Index: dbg_s.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/dbg_s.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dbg_s.c 1 Feb 2004 13:52:17 -0000 1.2 +++ dbg_s.c 11 Sep 2006 00:07:22 -0000 1.3 @@ -5,6 +5,9 @@ This file bases on DEBUG.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.3 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.2 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -36,11 +39,13 @@ #include "../config.h" -#include <stdio.h> - -#include "../include/debug.h" +#ifdef DEBUG -void dbg_outs(const char * const s) -{ if(s) fputs(s, dbg_logfile); - fflush(dbg_logfile); +void dbg_outs (const char *const s) { + if (s) { + fputs (s, dbg_logfile); + fflush (dbg_logfile); + } } + +#endif /* DEBUG */ Index: dbg_mem.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/dbg_mem.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dbg_mem.c 1 Feb 2004 13:52:17 -0000 1.4 +++ dbg_mem.c 11 Sep 2006 00:07:22 -0000 1.5 @@ -5,6 +5,9 @@ This file bases on DEBUG.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.5 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.4 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -42,19 +45,16 @@ #include "../config.h" -#include <conio.h> -#include <stdlib.h> -#include <alloc.h> +#ifdef DEBUG -#include "../include/debug.h" +#include <conio.h> /* cputs */ +#include <alloc.h> /* heapcheck, coreleft, farcoreleft */ #if sizeof(void*) != sizeof(void far*) #define DISP_NEAR #endif -#undef dbg_printmem -void dbg_printmem(void) -{ +void dbg_printmem (void) { #ifdef DISP_NEAR static unsigned nearLast = 0; #endif @@ -65,6 +65,7 @@ #endif unsigned long farThis; +#if __TURBOC__ > 0x201 switch(heapcheck()) { case _HEAPCORRUPT: cputs("HEAP CORRUPTED. Cannot proceed!\r\n"); @@ -78,6 +79,7 @@ case _HEAPOK: break; } +#endif #ifdef DISP_NEAR nearThis = coreleft(); @@ -100,3 +102,5 @@ #endif farLast = farThis; } + +#endif /* DEBUG */ Index: res_vald.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/res_vald.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- res_vald.c 9 Dec 2003 20:25:34 -0000 1.1 +++ res_vald.c 11 Sep 2006 00:07:22 -0000 1.2 @@ -24,13 +24,13 @@ /* Is called only, if the Strings resource had been found, hence, returning TRUE alsways. */ -#pragma argsused -static int test_fct(res_majorid_t major - , res_minorid_t minor - , long length - , FILE* f - , void * const arg) -{ + +static int test_fct (res_majorid_t major, + res_minorid_t minor, + long length, + FILE* f, + void *const arg) { + (void)major, (void)length, (void)f, (void)arg; assert(major == RES_ID_STRINGS); return minor == STRING_RESOURCE_MINOR_ID? 1 : 2; } Index: dbg_prnt.c =================================================================== RCS file: /cvsroot/freedos/freecom/lib/dbg_prnt.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dbg_prnt.c 1 Feb 2004 13:52:17 -0000 1.2 +++ dbg_prnt.c 11 Sep 2006 00:07:22 -0000 1.3 @@ -5,6 +5,9 @@ This file bases on DEBUG.C of FreeCOM v0.81 beta 1. $Log$ + Revision 1.3 2006/09/11 00:07:22 blairdude + Fixed compilation completely with Turbo C + Revision 1.2 2004/02/01 13:52:17 skaus add/upd: CVS $id$ keywords to/of files @@ -36,16 +39,12 @@ #include "../config.h" -#include <conio.h> -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <alloc.h> +#ifdef DEBUG -#include "../include/debug.h" +#include <stdarg.h> FILE *dbg_logfile = stdout; -char *dbg_logname = 0; +char *dbg_logname /*= NULL*/; void dbg_print(const char * const fmt, ...) { va_list ap; @@ -55,3 +54,5 @@ va_end(ap); fflush(dbg_logfile); } + +#endif /* DEBUG */ |