Date: Tue, 15 Oct 2002 17:46:01 +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.3.50 (via feedmail 8.3.emacs20_6 I) and Blat ver 1.8.6 Subject: Don't pollute the namespace so much [PATCH] Message-Id: Reply-To: djgpp-workers AT delorie DOT com Hello. Below is a patch that eliminates the remaining namespace pollution, according to tests/libclink. OK to commit? Thanks, bye, Rich =] Index: include/libc/stubs.h =================================================================== RCS file: /cvs/djgpp/djgpp/include/libc/stubs.h,v retrieving revision 1.12 diff -p -c -3 -r1.12 stubs.h *** include/libc/stubs.h 13 Apr 2002 07:42:19 -0000 1.12 --- include/libc/stubs.h 15 Oct 2002 16:30:40 -0000 *************** *** 1,3 **** --- 1,4 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #ifndef __dj_include_libc_stubs_h__ *************** extern "C" { *** 23,28 **** --- 24,32 ---- #define fnmatch __fnmatch #define fstatvfs __fstatvfs #define getcwd __getcwd + #define getgid __getgid + #define getgrgid __getgrgid + #define getgrnam __getgrnam #define glob __glob #define isatty __isatty #define lseek __lseek *************** extern "C" { *** 40,52 **** --- 44,61 ---- #define crlf2nl __crlf2nl #define dosmemget __dosmemget #define dosmemput __dosmemput + #define ecvtbuf __ecvtbuf + #define endgrent __endgrent #define fchown __fchown + #define fcvtbuf __fcvtbuf + #define fgetgrent __fgetgrent #define filelength __filelength #define findfirst __findfirst #define findnext __findnext #define fsync __fsync #define getdisk __getdisk #define getdtablesize __getdtablesize + #define getgrent __getgrent #define getitimer __getitimer #define gettimeofday __gettimeofday #define lfilelength __lfilelength *************** extern "C" { *** 55,72 **** --- 64,85 ---- #define moncontrol __moncontrol #define monstartup __monstartup #define movedata __movedata + #define opendir __opendir #define pow10 __pow10 #define pow2 __pow2 #define readlink __readlink #define sbrk __sbrk + #define setgrent __setgrent #define setitimer __setitimer #define setmode __setmode #define spawnve __spawnve #define spawnvpe __spawnvpe #define statfs __statfs #define stricmp __stricmp + #define strnicmp __strnicmp #define sync __sync #define tell __tell + #define tzsetwall __tzsetwall #define uclock __uclock #endif /* !_POSIX_SOURCE */ 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 -c -3 -r1.3 strnicmp.c *** src/libc/compat/string/strnicmp.c 3 Jun 1999 17:27:34 -0000 1.3 --- src/libc/compat/string/strnicmp.c 15 Oct 2002 16:30:48 -0000 *************** *** 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 -c -3 -r1.1 strncase.S *** src/libc/compat/string/strncase.S 2 Apr 1995 01:51:02 -0000 1.1 --- src/libc/compat/string/strncase.S 15 Oct 2002 16:31:04 -0000 *************** *** 1,4 **** /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ .global _strncasecmp _strncasecmp: ! jmp _strnicmp --- 1,4 ---- /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ .global _strncasecmp _strncasecmp: ! 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 -c -3 -r1.1 ecvt.c *** src/libc/compat/stdlib/ecvt.c 25 Jul 1998 18:58:44 -0000 1.1 --- src/libc/compat/stdlib/ecvt.c 15 Oct 2002 16:31:17 -0000 *************** *** 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 -c -3 -r1.1 ecvtbuf.c *** src/libc/compat/stdlib/ecvtbuf.c 25 Jul 1998 18:58:44 -0000 1.1 --- src/libc/compat/stdlib/ecvtbuf.c 15 Oct 2002 16:31:40 -0000 *************** *** 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 -c -3 -r1.1 fcvt.c *** src/libc/compat/stdlib/fcvt.c 25 Jul 1998 18:58:44 -0000 1.1 --- src/libc/compat/stdlib/fcvt.c 15 Oct 2002 16:32:04 -0000 *************** *** 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 -c -3 -r1.2 fcvtbuf.c *** src/libc/compat/stdlib/fcvtbuf.c 9 Jan 2002 22:00:10 -0000 1.2 --- src/libc/compat/stdlib/fcvtbuf.c 15 Oct 2002 16:32:09 -0000 *************** *** 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/posix/unistd/getgid.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/unistd/getgid.c,v retrieving revision 1.1 diff -p -c -3 -r1.1 getgid.c *** src/libc/posix/unistd/getgid.c 11 Jan 1995 08:45:08 -0000 1.1 --- src/libc/posix/unistd/getgid.c 15 Oct 2002 16:32:25 -0000 *************** *** 1,4 **** --- 1,6 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include gid_t Index: src/libc/posix/grp/getgrgid.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/grp/getgrgid.c,v retrieving revision 1.2 diff -p -c -3 -r1.2 getgrgid.c *** src/libc/posix/grp/getgrgid.c 19 Jun 2001 20:19:30 -0000 1.2 --- src/libc/posix/grp/getgrgid.c 15 Oct 2002 16:32:30 -0000 *************** *** 1,4 **** --- 1,6 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include #include #include Index: src/libc/posix/unistd/setgid.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/unistd/setgid.c,v retrieving revision 1.1 diff -p -c -3 -r1.1 setgid.c *** src/libc/posix/unistd/setgid.c 2 Apr 1995 01:34:26 -0000 1.1 --- src/libc/posix/unistd/setgid.c 15 Oct 2002 16:32:51 -0000 *************** *** 1,4 **** --- 1,6 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include #include Index: src/libc/posix/pwd/getpwuid.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/pwd/getpwuid.c,v retrieving revision 1.2 diff -p -c -3 -r1.2 getpwuid.c *** src/libc/posix/pwd/getpwuid.c 19 Jun 2001 20:23:23 -0000 1.2 --- src/libc/posix/pwd/getpwuid.c 15 Oct 2002 16:32:59 -0000 *************** *** 1,4 **** --- 1,6 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include #include #include Index: src/libc/posix/pwd/getpwnam.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/pwd/getpwnam.c,v retrieving revision 1.3 diff -p -c -3 -r1.3 getpwnam.c *** src/libc/posix/pwd/getpwnam.c 19 Jun 2001 20:23:43 -0000 1.3 --- src/libc/posix/pwd/getpwnam.c 15 Oct 2002 16:33:09 -0000 *************** *** 1,5 **** --- 1,7 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include #include #include Index: src/libc/posix/grp/getgrent.c =================================================================== RCS file: /cvs/djgpp/djgpp/src/libc/posix/grp/getgrent.c,v retrieving revision 1.1 diff -p -c -3 -r1.1 getgrent.c *** src/libc/posix/grp/getgrent.c 1 Apr 1995 22:29:40 -0000 1.1 --- src/libc/posix/grp/getgrent.c 15 Oct 2002 16:33:15 -0000 *************** *** 1,4 **** --- 1,6 ---- + /* Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ + #include #include #include