X-Authentication-Warning: delorie.com: mailnull set sender to djgpp-workers-bounces using -f Date: Sun, 14 Apr 2002 18:04:18 +0100 From: "Richard Dawe" Sender: rich AT phekda DOT freeserve DOT co DOT uk To: djgpp-workers AT delorie DOT com X-Mailer: Emacs 21.2.50 (via feedmail 8.3.emacs20_6 I) and Blat ver 1.8.6 Subject: Namespace pollution Message-Id: Reply-To: djgpp-workers AT delorie DOT com Hello. I just thought I'd have a look at tests/libclink, to see if there was any new namespace pollution. Below is a diff to fix some of the pollution I saw. OK to commit next weekend? We're currently polluting the namespace with brk. brk calls a function called __brk in crt0.S. Is it OK to rename the function in crt0.S to something else, so I can stub brk? Thanks, bye, Rich =] Index: include/libc/stubs.h =================================================================== RCS file: /cvs/djgpp/djgpp/include/libc/stubs.h,v retrieving revision 1.12 diff -p -u -3 -r1.12 stubs.h --- include/libc/stubs.h 2002/04/13 07:42:19 1.12 +++ include/libc/stubs.h 2002/04/14 16:58:02 @@ -40,7 +40,9 @@ extern "C" { #define crlf2nl __crlf2nl #define dosmemget __dosmemget #define dosmemput __dosmemput +#define ecvtbuf __ecvtbuf #define fchown __fchown +#define fcvtbuf __fcvtbuf #define filelength __filelength #define findfirst __findfirst #define findnext __findnext @@ -65,6 +67,7 @@ extern "C" { #define spawnvpe __spawnvpe #define statfs __statfs #define stricmp __stricmp +#define strnicmp __strnicmp #define sync __sync #define tell __tell #define uclock __uclock Index: src/libc/compat/string/strnicmp.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/string/strnicmp.c,v retrieving revision 1.3 diff -p -u -3 -r1.3 strnicmp.c --- src/libc/compat/string/strnicmp.c 1999/06/03 17:27:34 1.3 +++ src/libc/compat/string/strnicmp.c 2002/04/14 16:58:05 @@ -1,5 +1,7 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1999 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +#include #include #include Index: src/libc/compat/string/strncase.S =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/string/strncase.S,v retrieving revision 1.1 diff -p -u -3 -r1.1 strncase.S --- src/libc/compat/string/strncase.S 1995/04/02 01:51:02 1.1 +++ src/libc/compat/string/strncase.S 2002/04/14 16:58:05 @@ -1,4 +1,5 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ .global _strncasecmp _strncasecmp: - jmp _strnicmp + jmp ___strnicmp Index: src/libc/compat/stdlib/ecvt.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/stdlib/ecvt.c,v retrieving revision 1.1 diff -p -u -3 -r1.1 ecvt.c --- src/libc/compat/stdlib/ecvt.c 1998/07/25 18:58:44 1.1 +++ src/libc/compat/stdlib/ecvt.c 2002/04/14 16:58:07 @@ -1,4 +1,6 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +#include #include #include Index: src/libc/compat/stdlib/ecvtbuf.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/stdlib/ecvtbuf.c,v retrieving revision 1.1 diff -p -u -3 -r1.1 ecvtbuf.c --- src/libc/compat/stdlib/ecvtbuf.c 1998/07/25 18:58:44 1.1 +++ src/libc/compat/stdlib/ecvtbuf.c 2002/04/14 16:58:08 @@ -1,4 +1,6 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +#include #include #include #include Index: src/libc/compat/stdlib/fcvt.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/stdlib/fcvt.c,v retrieving revision 1.1 diff -p -u -3 -r1.1 fcvt.c --- src/libc/compat/stdlib/fcvt.c 1998/07/25 18:58:44 1.1 +++ src/libc/compat/stdlib/fcvt.c 2002/04/14 16:58:11 @@ -1,4 +1,6 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +#include #include #include Index: src/libc/compat/stdlib/fcvtbuf.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/compat/stdlib/fcvtbuf.c,v retrieving revision 1.2 diff -p -u -3 -r1.2 fcvtbuf.c --- src/libc/compat/stdlib/fcvtbuf.c 2002/01/09 22:00:10 1.2 +++ src/libc/compat/stdlib/fcvtbuf.c 2002/04/14 16:58:11 @@ -1,4 +1,6 @@ +/* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +#include #include #include #include