Remove support for old names in runtime
Hans Leidekker <hans-p/[email protected]> Sat, 20 Mar 2004 17:49:35 -0500
| Newsgroups | gmane.comp.gnu.mingw.patches |
|---|---|
| Organization | VU Amsterdam - Dienst IT |
| Message-ID | <[email protected]> |
--Boundary-00=_/pMXAvNjuRKCeG0
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
This patch removes support for old names (without the _ prefix) in
runtime. Why?
1. These names were already old in 1997.
2. Microsoft headers don't have them.
3. They break compilation of sources that happen to use the names themselves.
4. It's spring time and runtime could use a clean up.
After applying do:
cvs rm -f moldname.def.in isascii.c iscsym.c iscsymf.c \
toascii.c strcasecmp.c strncasecmp.c wcscmpi.c \
ctype_old.c string_old.c
Changelog:
2004-03-20 Hans Leidekker <hans-p/[email protected]>
* Remove support for old names.
--Boundary-00=_/pMXAvNjuRKCeG0
Content-Type: text/x-diff;
charset="us-ascii";
name="mingw_runtime_oldnames.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="mingw_runtime_oldnames.diff"
? mingwex/Makefile
? mingwex/config.log
? mingwex/config.status
? profile/Makefile
? profile/config.log
? profile/config.status
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/runtime/Makefile.in,v
retrieving revision 1.25
diff -u -r1.25 Makefile.in
--- Makefile.in 10 Oct 2003 15:02:03 -0000 1.25
+++ Makefile.in 20 Mar 2004 15:51:34 -0000
@@ -154,16 +154,11 @@
main.o crtst.o mthr_stub.o CRT_fp10.o txtmode.o \
pseudo-reloc.o pseudo-reloc-list.o
-MOLD_OBJS = isascii.o iscsym.o iscsymf.o toascii.o \
- strcasecmp.o strncasecmp.o wcscmpi.o
-
LIBS = libcrtdll.a \
libmsvcrt.a libmsvcrtd.a \
libmsvcr70.a libmsvcr70d.a \
libmsvcr71.a libmsvcr71d.a \
libmingw32.a \
- libcoldname.a \
- libmoldname.a libmoldnamed.a \
$(LIBM_A) \
libmingwthrd.a
@@ -173,10 +168,8 @@
Makefile.in README TODO config.guess config.sub configure configure.in \
crt1.c crtdll.def crtmt.c crtst.c dllcrt1.c dllmain.c \
gccmain.c init.c install-sh jamfile main.c mkinstalldirs \
-moldname.def.in msvcrt.def.in \
+msvcrt.def.in \
mthr.c mthr_init.c mthr_stub.c readme.txt \
-isascii.c iscsym.c iscsymf.c toascii.c \
-strcasecmp.c strncasecmp.c wcscmpi.c \
CRT_fp8.c CRT_fp10.c test_headers.c txtmode.c binmode.c pseudo-reloc.c \
pseudo-reloc-list.c
@@ -250,42 +243,6 @@
-D__MSVCRT__ -C -E -P \
-xc-header $? > $@
-moldname-crtdll.def: moldname.def.in
- $(CC) -DRUNTIME=crtdll \
- -D__FILENAME__=moldname-crtdll.def \
- -D__CRTDLL__ -C -E -P \
- -xc-header $? > $@
-
-moldname-msvcrt.def: moldname.def.in
- $(CC) -DRUNTIME=msvcrt \
- -D__FILENAME__=moldname-msvcrt.def \
- -D__MSVCRT__ -C -E -P \
- -xc-header $? > $@
-
-libcoldname.a: moldname-crtdll.def $(MOLD_OBJS)
- $(DLLTOOL) --as $(AS) -k -U \
- --dllname crtdll.dll \
- --def moldname-crtdll.def \
- --output-lib $@
- $(AR) rc $@ $(MOLD_OBJS)
- $(RANLIB) $@
-
-libmoldname.a: moldname-msvcrt.def $(MOLD_OBJS)
- $(DLLTOOL) --as $(AS) -k -U \
- --dllname msvcrt.dll \
- --def moldname-msvcrt.def \
- --output-lib $@
- $(AR) rc $@ $(MOLD_OBJS)
- $(RANLIB) $@
-
-libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS)
- $(DLLTOOL) --as $(AS) -k -U \
- --dllname msvcrtd.dll \
- --def moldname-msvcrt.def \
- --output-lib $@
- $(AR) rc $@ $(MOLD_OBJS)
- $(RANLIB) $@
-
# The special rules are necessary.
crt1.o dllcrt1.o:
$(CC) -c -D__CRTDLL__ -U__MSVCRT__ $(ALL_CFLAGS) $< -o $@
@@ -316,7 +273,6 @@
clean:
-rm -f *.o *.a *~ core a.out mingwthrd.def mingwthrd.base mingwthrd.exp
-rm -f $(THREAD_DLL_NAME) mingwthrd_dummy.exe
- -rm -f moldname-*.def
@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
distclean: clean
@@ -437,13 +393,10 @@
crt2.o: crt1.c init.c
crtmt.o: crtmt.c
crtst.o: crtst.c
-ctype_old.o: ctype_old.c
dllcrt1.o: dllcrt1.c
dllcrt2.o: dllcrt1.c
dllmain.o: dllmain.c
main.o: main.c
-oldnames.o: oldnames.c
-string_old.o: string_old.c
CRT_fp8.o: CRT_fp8.c
CRT_fp10.o: CRT_fp10.c
Index: include/conio.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/conio.h,v
retrieving revision 1.4
diff -u -r1.4 conio.h
--- include/conio.h 21 Feb 2003 21:19:51 -0000 1.4
+++ include/conio.h 20 Mar 2004 15:51:36 -0000
@@ -50,18 +50,6 @@
_CRTIMP int __cdecl _putch (int);
_CRTIMP int __cdecl _ungetch (int);
-
-#ifndef _NO_OLDNAMES
-
-_CRTIMP int __cdecl getch (void);
-_CRTIMP int __cdecl getche (void);
-_CRTIMP int __cdecl kbhit (void);
-_CRTIMP int __cdecl putch (int);
-_CRTIMP int __cdecl ungetch (int);
-
-#endif /* Not _NO_OLDNAMES */
-
-
#ifdef __cplusplus
}
#endif
Index: include/ctype.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/ctype.h,v
retrieving revision 1.9
diff -u -r1.9 ctype.h
--- include/ctype.h 10 Oct 2003 15:02:04 -0000 1.9
+++ include/ctype.h 20 Mar 2004 15:51:37 -0000
@@ -240,14 +240,6 @@
__CRT_INLINE int __cdecl __iscsym(int c) {return (isalnum(c) || (c == '_'));}
#endif /* __NO_CTYPE_INLINES */
-#ifndef _NO_OLDNAMES
-/* Not _CRTIMP */
-int __cdecl isascii (int);
-int __cdecl toascii (int);
-int __cdecl iscsymf (int);
-int __cdecl iscsym (int);
-#endif /* Not _NO_OLDNAMES */
-
#endif /* Not __STRICT_ANSI__ */
#ifdef __cplusplus
Index: include/direct.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/direct.h,v
retrieving revision 1.4
diff -u -r1.4 direct.h
--- include/direct.h 21 Feb 2003 21:19:51 -0000 1.4
+++ include/direct.h 20 Mar 2004 15:51:37 -0000
@@ -67,10 +67,6 @@
_CRTIMP char* __cdecl _getdcwd (int, char*, int);
_CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
-#ifndef _NO_OLDNAMES
-# define diskfree_t _diskfree_t
-#endif
-
#ifndef _WDIRECT_DEFINED
/* wide character versions. Also in wchar.h */
#ifdef __MSVCRT__
Index: include/dos.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/dos.h,v
retrieving revision 1.5
diff -u -r1.5 dos.h
--- include/dos.h 21 Feb 2003 21:19:51 -0000 1.5
+++ include/dos.h 20 Mar 2004 15:51:37 -0000
@@ -94,10 +94,6 @@
_CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
-#ifndef _NO_OLDNAMES
-# define diskfree_t _diskfree_t
-#endif
-
#ifdef __cplusplus
}
#endif
Index: include/fcntl.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/fcntl.h,v
retrieving revision 1.6
diff -u -r1.6 fcntl.h
--- include/fcntl.h 12 Nov 2002 15:29:38 -0000 1.6
+++ include/fcntl.h 20 Mar 2004 15:51:37 -0000
@@ -65,26 +65,6 @@
#define _O_BINARY 0x8000 /* Input and output is not translated. */
#define _O_RAW _O_BINARY
-#ifndef _NO_OLDNAMES
-
-/* POSIX/Non-ANSI names for increased portability */
-#define O_RDONLY _O_RDONLY
-#define O_WRONLY _O_WRONLY
-#define O_RDWR _O_RDWR
-#define O_ACCMODE _O_ACCMODE
-#define O_APPEND _O_APPEND
-#define O_CREAT _O_CREAT
-#define O_TRUNC _O_TRUNC
-#define O_EXCL _O_EXCL
-#define O_TEXT _O_TEXT
-#define O_BINARY _O_BINARY
-#define O_TEMPORARY _O_TEMPORARY
-#define O_NOINHERIT _O_NOINHERIT
-#define O_SEQUENTIAL _O_SEQUENTIAL
-#define O_RANDOM _O_RANDOM
-
-#endif /* Not _NO_OLDNAMES */
-
#endif /* Not _FCNTL_H_ */
#endif /* Not __STRICT_ANSI__ */
Index: include/io.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/io.h,v
retrieving revision 1.8
diff -u -r1.8 io.h
--- include/io.h 10 Oct 2003 15:02:04 -0000 1.8
+++ include/io.h 20 Mar 2004 15:51:42 -0000
@@ -142,20 +142,6 @@
_CRTIMP __int64 __cdecl _telli64(int);
#endif /* __MSVCRT__ */
-
-#ifndef _NO_OLDNAMES
-
-#ifndef _UWIN
-_CRTIMP int __cdecl chdir (const char*);
-_CRTIMP char* __cdecl getcwd (char*, int);
-_CRTIMP int __cdecl mkdir (const char*);
-_CRTIMP char* __cdecl mktemp (char*);
-_CRTIMP int __cdecl rmdir (const char*);
-_CRTIMP int __cdecl chmod (const char*, int);
-#endif /* _UWIN */
-
-#endif /* Not _NO_OLDNAMES */
-
#ifdef __cplusplus
}
#endif
@@ -247,50 +233,6 @@
#endif /* defined (__MSVCRT__) */
#define _WIO_DEFINED
#endif /* _WIO_DEFINED */
-
-#ifndef _NO_OLDNAMES
-/*
- * Non-underscored versions of non-ANSI functions to improve portability.
- * These functions live in libmoldname.a.
- */
-
-#ifndef _UWIN
-_CRTIMP int __cdecl access (const char*, int);
-_CRTIMP int __cdecl chsize (int, long );
-_CRTIMP int __cdecl close (int);
-_CRTIMP int __cdecl creat (const char*, int);
-_CRTIMP int __cdecl dup (int);
-_CRTIMP int __cdecl dup2 (int, int);
-_CRTIMP int __cdecl eof (int);
-_CRTIMP long __cdecl filelength (int);
-_CRTIMP int __cdecl isatty (int);
-_CRTIMP long __cdecl lseek (int, long, int);
-_CRTIMP int __cdecl open (const char*, int, ...);
-_CRTIMP int __cdecl read (int, void*, unsigned int);
-_CRTIMP int __cdecl setmode (int, int);
-_CRTIMP int __cdecl sopen (const char*, int, int, ...);
-_CRTIMP long __cdecl tell (int);
-_CRTIMP int __cdecl umask (int);
-_CRTIMP int __cdecl unlink (const char*);
-_CRTIMP int __cdecl write (int, const void*, unsigned int);
-#endif /* _UWIN */
-
-/* Wide character versions. Also declared in wchar.h. */
-/* Where do these live? Not in libmoldname.a nor in libmsvcrt.a */
-#if 0
-int waccess(const wchar_t *, int);
-int wchmod(const wchar_t *, int);
-int wcreat(const wchar_t *, int);
-long wfindfirst(wchar_t *, struct _wfinddata_t *);
-int wfindnext(long, struct _wfinddata_t *);
-int wunlink(const wchar_t *);
-int wrename(const wchar_t *, const wchar_t *);
-int wopen(const wchar_t *, int, ...);
-int wsopen(const wchar_t *, int, int, ...);
-wchar_t * wmktemp(wchar_t *);
-#endif
-
-#endif /* Not _NO_OLDNAMES */
#ifdef __cplusplus
}
Index: include/malloc.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/malloc.h,v
retrieving revision 1.9
diff -u -r1.9 malloc.h
--- include/malloc.h 21 Feb 2003 21:19:51 -0000 1.9
+++ include/malloc.h 20 Mar 2004 15:51:42 -0000
@@ -65,13 +65,6 @@
#define _alloca(x) __builtin_alloca((x))
#endif
-#ifndef _NO_OLDNAMES
-_CRTIMP int __cdecl heapwalk (_HEAPINFO*);
-#ifdef __GNUC__
-#define alloca(x) __builtin_alloca((x))
-#endif
-#endif /* Not _NO_OLDNAMES */
-
_CRTIMP int __cdecl _heapchk (void); /* Verify heap integrety. */
_CRTIMP int __cdecl _heapmin (void); /* Return unused heap to the OS. */
_CRTIMP int __cdecl _heapset (unsigned int);
Index: include/math.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/math.h,v
retrieving revision 1.16
diff -u -r1.16 math.h
--- include/math.h 10 Oct 2003 15:02:04 -0000 1.16
+++ include/math.h 20 Mar 2004 15:51:43 -0000
@@ -45,20 +45,6 @@
* Exception types with non-ANSI names for compatibility.
*/
-#ifndef __STRICT_ANSI__
-#ifndef _NO_OLDNAMES
-
-#define DOMAIN _DOMAIN
-#define SING _SING
-#define OVERFLOW _OVERFLOW
-#define UNDERFLOW _UNDERFLOW
-#define TLOSS _TLOSS
-#define PLOSS _PLOSS
-
-#endif /* Not _NO_OLDNAMES */
-#endif /* Not __STRICT_ANSI__ */
-
-
/* Traditional/XOPEN math constants (double precison) */
#ifndef __STRICT_ANSI__
#define M_E 2.7182818284590452354
@@ -211,29 +197,6 @@
_CRTIMP int __cdecl _isnan (double);
/* END FLOAT.H COPY */
-
-
-/*
- * Non-underscored versions of non-ANSI functions.
- * These reside in liboldnames.a.
- */
-
-#if !defined (_NO_OLDNAMES)
-
-_CRTIMP double __cdecl cabs (struct _complex);
-_CRTIMP double __cdecl j0 (double);
-_CRTIMP double __cdecl j1 (double);
-_CRTIMP double __cdecl jn (int, double);
-_CRTIMP double __cdecl y0 (double);
-_CRTIMP double __cdecl y1 (double);
-_CRTIMP double __cdecl yn (int, double);
-
-_CRTIMP double __cdecl chgsign (double);
-_CRTIMP double __cdecl scalb (double, long);
-_CRTIMP int __cdecl finite (double);
-_CRTIMP int __cdecl fpclass (double);
-
-#endif /* Not _NO_OLDNAMES */
#endif /* __STRICT_ANSI__ */
Index: include/process.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/process.h,v
retrieving revision 1.5
diff -u -r1.5 process.h
--- include/process.h 15 Sep 2003 14:18:35 -0000 1.5
+++ include/process.h 20 Mar 2004 15:51:43 -0000
@@ -42,11 +42,6 @@
#define _WAIT_CHILD 0
#define _WAIT_GRANDCHILD 1
-#ifndef _NO_OLDNAMES
-#define WAIT_CHILD _WAIT_CHILD
-#define WAIT_GRANDCHILD _WAIT_GRANDCHILD
-#endif /* Not _NO_OLDNAMES */
-
/*
* Mode constants for spawn functions.
*/
@@ -57,16 +52,6 @@
#define _P_NOWAITO 3
#define _P_DETACH 4
-#ifndef _NO_OLDNAMES
-#define P_WAIT _P_WAIT
-#define P_NOWAIT _P_NOWAIT
-#define P_OVERLAY _P_OVERLAY
-#define OLD_P_OVERLAY _OLD_P_OVERLAY
-#define P_NOWAITO _P_NOWAITO
-#define P_DETACH _P_DETACH
-#endif /* Not _NO_OLDNAMES */
-
-
#ifndef RC_INVOKED
#ifdef __cplusplus
@@ -120,32 +105,6 @@
void*, unsigned, unsigned*);
_CRTIMP void __cdecl _endthreadex (unsigned);
#endif
-
-
-#ifndef _NO_OLDNAMES
-/*
- * Functions without the leading underscore, for portability. These functions
- * live in liboldnames.a.
- */
-_CRTIMP int __cdecl cwait (int*, pid_t, int);
-_CRTIMP pid_t __cdecl getpid (void);
-_CRTIMP int __cdecl execl (const char*, const char*, ...);
-_CRTIMP int __cdecl execle (const char*, const char*, ...);
-_CRTIMP int __cdecl execlp (const char*, const char*, ...);
-_CRTIMP int __cdecl execlpe (const char*, const char*, ...);
-_CRTIMP int __cdecl execv (const char*, const char* const*);
-_CRTIMP int __cdecl execve (const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl execvp (const char*, const char* const*);
-_CRTIMP int __cdecl execvpe (const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl spawnl (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnle (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnlp (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnlpe (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnv (int, const char*, const char* const*);
-_CRTIMP int __cdecl spawnve (int, const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl spawnvp (int, const char*, const char* const*);
-_CRTIMP int __cdecl spawnvpe (int, const char*, const char* const*, const char* const*);
-#endif /* Not _NO_OLDNAMES */
#ifdef __cplusplus
}
Index: include/search.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/search.h,v
retrieving revision 1.1
diff -u -r1.1 search.h
--- include/search.h 15 Sep 2003 14:23:42 -0000 1.1
+++ include/search.h 20 Mar 2004 15:51:44 -0000
@@ -48,13 +48,6 @@
unsigned int, int (*)(const void*, const void*));
_CRTIMP void* __cdecl _lsearch (const void*, void*, unsigned int*, unsigned int,
int (*)(const void*, const void*));
-
-#ifndef _NO_OLDNAMES
-_CRTIMP void* __cdecl lfind (const void*, const void*, unsigned int*,
- unsigned int, int (*)(const void*, const void*));
-_CRTIMP void* __cdecl lsearch (const void*, void*, unsigned int*, unsigned int,
- int (*)(const void*, const void*));
-#endif
#endif /* __STRICT_ANSI__ */
#ifdef __cplusplus
Index: include/share.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/share.h,v
retrieving revision 1.4
diff -u -r1.4 share.h
--- include/share.h 12 Aug 2002 13:06:35 -0000 1.4
+++ include/share.h 20 Mar 2004 15:51:44 -0000
@@ -38,20 +38,6 @@
#define _SH_DENYRD 0x30 /* Deny read */
#define _SH_DENYNO 0x40 /* Deny nothing */
-#ifndef __STRICT_ANSI__
-
-#ifndef _NO_OLDNAMES
-
-/* Non ANSI names */
-#define SH_DENYRW _SH_DENYRW
-#define SH_DENYWR _SH_DENYWR
-#define SH_DENYRD _SH_DENYRD
-#define SH_DENYNO _SH_DENYNO
-
-#endif /* Not _NO_OLDNAMES */
-
-#endif /* Not __STRICT_ANSI__ */
-
#endif /* Not _SHARE_H_ */
#endif /* Not __STRICT_ANSI__ */
Index: include/stdio.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdio.h,v
retrieving revision 1.15
diff -u -r1.15 stdio.h
--- include/stdio.h 10 Oct 2003 15:02:04 -0000 1.15
+++ include/stdio.h 20 Mar 2004 15:51:44 -0000
@@ -199,10 +199,6 @@
_CRTIMP char* __cdecl tmpnam (char*);
_CRTIMP char* __cdecl _tempnam (const char*, const char*);
-#ifndef NO_OLDNAMES
-_CRTIMP char* __cdecl tempnam (const char*, const char*);
-#endif
-
_CRTIMP int __cdecl setvbuf (FILE*, char*, int, size_t);
_CRTIMP void __cdecl setbuf (FILE*, char*);
@@ -360,11 +356,6 @@
_CRTIMP FILE* __cdecl _popen (const char*, const char*);
_CRTIMP int __cdecl _pclose (FILE*);
-#ifndef NO_OLDNAMES
-_CRTIMP FILE* __cdecl popen (const char*, const char*);
-_CRTIMP int __cdecl pclose (FILE*);
-#endif
-
/*
* Other Non ANSI functions
*/
@@ -381,16 +372,6 @@
#define _fileno(__F) ((__F)->_file)
-#ifndef _NO_OLDNAMES
-_CRTIMP int __cdecl fgetchar (void);
-_CRTIMP int __cdecl fputchar (int);
-_CRTIMP FILE* __cdecl fdopen (int, const char*);
-_CRTIMP int __cdecl fileno (FILE*);
-
-#define fileno(__F) ((__F)->_file)
-
-#endif /* Not _NO_OLDNAMES */
-
#endif /* Not __STRICT_ANSI__ */
/* Wide versions */
@@ -449,11 +430,6 @@
#endif /* _WSTDIO_DEFINED */
#ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
-#ifndef NO_OLDNAMES
-_CRTIMP FILE* __cdecl wpopen (const wchar_t*, const wchar_t*);
-#endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
/*
* Other Non ANSI wide functions
@@ -462,13 +438,6 @@
_CRTIMP wint_t __cdecl _fputwchar (wint_t);
_CRTIMP int __cdecl _getw (FILE*);
_CRTIMP int __cdecl _putw (int, FILE*);
-
-#ifndef _NO_OLDNAMES
-_CRTIMP wint_t __cdecl fgetwchar (void);
-_CRTIMP wint_t __cdecl fputwchar (wint_t);
-_CRTIMP int __cdecl getw (FILE*);
-_CRTIMP int __cdecl putw (int, FILE*);
-#endif /* Not _NO_OLDNAMES */
#endif /* __STRICT_ANSI */
Index: include/stdlib.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/stdlib.h,v
retrieving revision 1.19
diff -u -r1.19 stdlib.h
--- include/stdlib.h 10 Oct 2003 15:02:04 -0000 1.19
+++ include/stdlib.h 20 Mar 2004 15:51:54 -0000
@@ -458,21 +458,6 @@
_CRTIMP unsigned long __cdecl _lrotr(unsigned long, int);
#endif
-#ifndef _NO_OLDNAMES
-
-_CRTIMP int __cdecl putenv (const char*);
-_CRTIMP void __cdecl searchenv (const char*, const char*, char*);
-
-_CRTIMP char* __cdecl itoa (int, char*, int);
-_CRTIMP char* __cdecl ltoa (long, char*, int);
-
-#ifndef _UWIN
-_CRTIMP char* __cdecl ecvt (double, int, int*, int*);
-_CRTIMP char* __cdecl fcvt (double, int, int*, int*);
-_CRTIMP char* __cdecl gcvt (double, int, char*);
-#endif /* _UWIN */
-#endif /* Not _NO_OLDNAMES */
-
#endif /* Not __STRICT_ANSI__ */
/* C99 names */
Index: include/string.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/string.h,v
retrieving revision 1.7
diff -u -r1.7 string.h
--- include/string.h 10 Oct 2003 15:02:04 -0000 1.7
+++ include/string.h 20 Mar 2004 15:51:54 -0000
@@ -146,56 +146,6 @@
#endif /* Not __STRICT_ANSI__ */
-
-#ifndef __STRICT_ANSI__
-#ifndef _NO_OLDNAMES
-
-/*
- * Non-underscored versions of non-ANSI functions. They live in liboldnames.a
- * and provide a little extra portability. Also a few extra UNIX-isms like
- * strcasecmp.
- */
-
-_CRTIMP void* __cdecl memccpy (void*, const void*, int, size_t);
-_CRTIMP int __cdecl memicmp (const void*, const void*, size_t);
-_CRTIMP char* __cdecl strdup (const char*);
-_CRTIMP int __cdecl strcmpi (const char*, const char*);
-_CRTIMP int __cdecl stricmp (const char*, const char*);
-__CRT_INLINE int __cdecl
-strcasecmp (const char * __sz1, const char * __sz2)
- {return _stricmp (__sz1, __sz2);}
-_CRTIMP int __cdecl stricoll (const char*, const char*);
-_CRTIMP char* __cdecl strlwr (char*);
-_CRTIMP int __cdecl strnicmp (const char*, const char*, size_t);
-__CRT_INLINE int __cdecl
-strncasecmp (const char * __sz1, const char * __sz2, size_t __sizeMaxCompare)
- {return _strnicmp (__sz1, __sz2, __sizeMaxCompare);}
-_CRTIMP char* __cdecl strnset (char*, int, size_t);
-_CRTIMP char* __cdecl strrev (char*);
-_CRTIMP char* __cdecl strset (char*, int);
-_CRTIMP char* __cdecl strupr (char*);
-#ifndef _UWIN
-_CRTIMP void __cdecl swab (const char*, char*, size_t);
-#endif /* _UWIN */
-
-/* NOTE: There is no _wcscmpi, but this is for compatibility. */
-__CRT_INLINE int __cdecl
-wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2)
- {return _wcsicmp (__ws1, __ws2);}
-_CRTIMP wchar_t* __cdecl wcsdup (wchar_t*);
-_CRTIMP int __cdecl wcsicmp (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl wcsicoll (const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcslwr (wchar_t*);
-_CRTIMP int __cdecl wcsnicmp (const wchar_t*, const wchar_t*, size_t);
-_CRTIMP wchar_t* __cdecl wcsnset (wchar_t*, wchar_t, size_t);
-_CRTIMP wchar_t* __cdecl wcsrev (wchar_t*);
-_CRTIMP wchar_t* __cdecl wcsset (wchar_t*, wchar_t);
-_CRTIMP wchar_t* __cdecl wcsupr (wchar_t*);
-
-#endif /* Not _NO_OLDNAMES */
-#endif /* Not strict ANSI */
-
-
#ifdef __cplusplus
}
#endif
Index: include/time.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/time.h,v
retrieving revision 1.7
diff -u -r1.7 time.h
--- include/time.h 3 May 2003 13:48:46 -0000 1.7
+++ include/time.h 20 Mar 2004 15:51:54 -0000
@@ -121,10 +121,6 @@
#ifndef __STRICT_ANSI__
extern _CRTIMP void __cdecl _tzset (void);
-#ifndef _NO_OLDNAMES
-extern _CRTIMP void __cdecl tzset (void);
-#endif
-
_CRTIMP char* __cdecl _strdate(char*);
_CRTIMP char* __cdecl _strtime(char*);
@@ -171,43 +167,6 @@
#endif /* __DECLSPEC_SUPPORTED */
#endif /* not __MSVCRT__ */
-
-#ifndef _NO_OLDNAMES
-
-#ifdef __MSVCRT__
-
-/* These go in the oldnames import library for MSVCRT. */
-__MINGW_IMPORT int daylight;
-__MINGW_IMPORT long timezone;
-__MINGW_IMPORT char *tzname[2];
-
-#ifndef _WTIME_DEFINED
-
-/* wide function prototypes, also declared in wchar.h */
-
-_CRTIMP wchar_t* __cdecl _wasctime(const struct tm*);
-_CRTIMP wchar_t* __cdecl _wctime(const time_t*);
-_CRTIMP wchar_t* __cdecl _wstrdate(wchar_t*);
-_CRTIMP wchar_t* __cdecl _wstrtime(wchar_t*);
-
-#define _WTIME_DEFINED
-#endif /* _WTIME_DEFINED */
-
-
-#else /* not __MSVCRT__ */
-
-/* CRTDLL is royally messed up when it comes to these macros.
- TODO: import and alias these via oldnames import library instead
- of macros. */
-
-#define daylight _daylight
-/* NOTE: timezone not defined because it would conflict with sys/timeb.h.
- Also, tzname used to a be macro, but now it's in moldname. */
-__MINGW_IMPORT char *tzname[2];
-
-#endif /* not __MSVCRT__ */
-
-#endif /* Not _NO_OLDNAMES */
#ifdef __cplusplus
}
Index: include/wchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/wchar.h,v
retrieving revision 1.11
diff -u -r1.11 wchar.h
--- include/wchar.h 10 Oct 2003 15:02:04 -0000 1.11
+++ include/wchar.h 20 Mar 2004 15:51:54 -0000
@@ -260,26 +260,6 @@
#define _WSTDLIB_DEFINED
#endif
-
-#ifndef _NO_OLDNAMES
-
-/* Wide character versions. Also declared in io.h. */
-/* CHECK: Are these in the oldnames??? NO! */
-#if (0)
-int waccess (const wchar_t *, int);
-int wchmod (const wchar_t *, int);
-int wcreat (const wchar_t *, int);
-long wfindfirst (wchar_t *, struct _wfinddata_t *);
-int wfindnext (long, struct _wfinddata_t *);
-int wunlink (const wchar_t *);
-int wrename (const wchar_t *, const wchar_t *);
-int wremove (const wchar_t *);
-int wopen (const wchar_t *, int, ...);
-int wsopen (const wchar_t *, int, int, ...);
-wchar_t* wmktemp (wchar_t *);
-#endif
-#endif /* _NO_OLDNAMES */
-
#endif /* not __STRICT_ANSI__ */
/* These are resolved by -lmsvcp60 */
Index: include/sys/locking.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/locking.h,v
retrieving revision 1.4
diff -u -r1.4 locking.h
--- include/sys/locking.h 29 Nov 2001 04:26:33 -0000 1.4
+++ include/sys/locking.h 20 Mar 2004 15:51:54 -0000
@@ -38,14 +38,6 @@
#define _LK_RLCK 3 /* Lock for read only */
#define _LK_NBRLCK 4 /* Non-blocking lock for read only */
-#ifndef NO_OLDNAMES
-#define LK_UNLCK _LK_UNLCK
-#define LK_LOCK _LK_LOCK
-#define LK_NBLCK _LK_NBLCK
-#define LK_RLCK _LK_RLCK
-#define LK_NBRLCK _LK_NBRLCK
-#endif /* Not NO_OLDNAMES */
-
#endif /* Not _LOCKING_H_ */
#endif /* Not __STRICT_ANSI__ */
Index: include/sys/stat.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/stat.h,v
retrieving revision 1.5
diff -u -r1.5 stat.h
--- include/sys/stat.h 21 Feb 2003 21:19:52 -0000 1.5
+++ include/sys/stat.h 20 Mar 2004 15:51:54 -0000
@@ -67,30 +67,6 @@
#define _S_ISBLK(m) (((m) & _S_IFMT) == _S_IFBLK)
#define _S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#ifndef _NO_OLDNAMES
-
-#define S_IFIFO _S_IFIFO
-#define S_IFCHR _S_IFCHR
-#define S_IFBLK _S_IFBLK
-#define S_IFDIR _S_IFDIR
-#define S_IFREG _S_IFREG
-#define S_IFMT _S_IFMT
-#define S_IEXEC _S_IEXEC
-#define S_IWRITE _S_IWRITE
-#define S_IREAD _S_IREAD
-#define S_IRWXU _S_IRWXU
-#define S_IXUSR _S_IXUSR
-#define S_IWUSR _S_IWUSR
-#define S_IRUSR _S_IRUSR
-
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-
-#endif /* Not _NO_OLDNAMES */
-
#ifndef RC_INVOKED
#ifndef _STAT_DEFINED
@@ -167,16 +143,6 @@
#define _WSTAT_DEFINED
#endif /* _WSTAT_DEFIND */
#endif /* __MSVCRT__ */
-
-#ifndef _NO_OLDNAMES
-
-/* These functions live in liboldnames.a. */
-_CRTIMP int __cdecl fstat (int, struct stat*);
-_CRTIMP int __cdecl chmod (const char*, int);
-_CRTIMP int __cdecl stat (const char*, struct stat*);
-
-#endif /* Not _NO_OLDNAMES */
-
#ifdef __cplusplus
}
Index: include/sys/timeb.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/timeb.h,v
retrieving revision 1.4
diff -u -r1.4 timeb.h
--- include/sys/timeb.h 21 Feb 2003 21:19:52 -0000 1.4
+++ include/sys/timeb.h 20 Mar 2004 15:51:54 -0000
@@ -45,30 +45,12 @@
short dstflag;
};
-#ifndef _NO_OLDNAMES
-/*
- * TODO: Structure not tested.
- */
-struct timeb
-{
- long time;
- short millitm;
- short timezone;
- short dstflag;
-};
-#endif
-
-
#ifdef __cplusplus
extern "C" {
#endif
/* TODO: Not tested. */
_CRTIMP void __cdecl _ftime (struct _timeb*);
-
-#ifndef _NO_OLDNAMES
-_CRTIMP void __cdecl ftime (struct timeb*);
-#endif /* Not _NO_OLDNAMES */
#ifdef __cplusplus
}
Index: include/sys/types.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/types.h,v
retrieving revision 1.6
diff -u -r1.6 types.h
--- include/sys/types.h 10 Oct 2003 15:11:05 -0000 1.6
+++ include/sys/types.h 20 Mar 2004 15:51:54 -0000
@@ -51,10 +51,6 @@
#ifndef _OFF_T_
#define _OFF_T_
typedef long _off_t;
-
-#ifndef _NO_OLDNAMES
-typedef _off_t off_t;
-#endif
#endif /* Not _OFF_T_ */
@@ -65,59 +61,35 @@
#else
typedef short _dev_t;
#endif
-
-#ifndef _NO_OLDNAMES
-typedef _dev_t dev_t;
-#endif
#endif /* Not _DEV_T_ */
#ifndef _INO_T_
#define _INO_T_
typedef short _ino_t;
-
-#ifndef _NO_OLDNAMES
-typedef _ino_t ino_t;
-#endif
#endif /* Not _INO_T_ */
#ifndef _PID_T_
#define _PID_T_
typedef int _pid_t;
-
-#ifndef _NO_OLDNAMES
-typedef _pid_t pid_t;
-#endif
#endif /* Not _PID_T_ */
#ifndef _MODE_T_
#define _MODE_T_
typedef unsigned short _mode_t;
-
-#ifndef _NO_OLDNAMES
-typedef _mode_t mode_t;
-#endif
#endif /* Not _MODE_T_ */
#ifndef _SIGSET_T_
#define _SIGSET_T_
typedef int _sigset_t;
-
-#ifndef _NO_OLDNAMES
-typedef _sigset_t sigset_t;
-#endif
#endif /* Not _SIGSET_T_ */
#ifndef _SSIZE_T_
#define _SSIZE_T_
typedef long _ssize_t;
-
-#ifndef _NO_OLDNAMES
-typedef _ssize_t ssize_t;
-#endif
#endif /* Not _SSIZE_T_ */
#endif /* Not __STRICT_ANSI__ */
Index: include/sys/utime.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/sys/utime.h,v
retrieving revision 1.4
diff -u -r1.4 utime.h
--- include/sys/utime.h 21 Feb 2003 21:19:52 -0000 1.4
+++ include/sys/utime.h 20 Mar 2004 15:51:54 -0000
@@ -50,17 +50,6 @@
time_t modtime; /* Modification time */
};
-
-#ifndef _NO_OLDNAMES
-/* NOTE: Must be the same as _utimbuf above. */
-struct utimbuf
-{
- time_t actime;
- time_t modtime;
-};
-#endif /* Not _NO_OLDNAMES */
-
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -73,9 +62,6 @@
#ifdef __MSVCRT__
_CRTIMP int __cdecl _wutime (const wchar_t*, struct _utimbuf*);
#endif /* MSVCRT runtime */
-#ifndef _NO_OLDNAMES
-_CRTIMP int __cdecl utime (const char*, struct utimbuf*);
-#endif /* Not _NO_OLDNAMES */
#ifdef __cplusplus
}
Index: profile/gmon.c
===================================================================
RCS file: /cvsroot/mingw/runtime/profile/gmon.c,v
retrieving revision 1.2
diff -u -r1.2 gmon.c
--- profile/gmon.c 25 Jan 2002 20:05:27 -0000 1.2
+++ profile/gmon.c 20 Mar 2004 15:51:55 -0000
@@ -215,13 +215,13 @@
proffile = "gmon.out";
#endif
- fd = open(proffile , O_CREAT|O_TRUNC|O_WRONLY|O_BINARY, 0666);
+ fd = open(proffile , _O_CREAT|_O_TRUNC|_O_WRONLY|_O_BINARY, 0666);
if (fd < 0) {
perror( proffile );
return;
}
#ifdef DEBUG
- log = open("gmon.log", O_CREAT|O_TRUNC|O_WRONLY, 0664);
+ log = open("gmon.log", _O_CREAT|_O_TRUNC|_O_WRONLY, 0664);
if (log < 0) {
perror("mcount: gmon.log");
return;
--Boundary-00=_/pMXAvNjuRKCeG0--
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click