* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL).

	(wpopen): Add if !(__CRTDLL).
	* Makefile.in (moldname-msvcrt.def rule): Use -C, not -c to
	preserve comments.
	(moldname-crtdll.def rule): Likewise.
	* moldname-msvcrt.def: Regenerate.
	* moldname-crtdll.def: Regenerate.
	* include/stdio.h (wpopen):Use prototype, not a define.
	(_swnprintf): Add prototype.
	(_vswnprintf): Likewise.
	Tidy up whitespace.
	* include/wchar.h (_swnprintf): Add prototype.
	(_vswnprintf): Likewise.
	Tidy up whitespace.

1 files changed, 142 insertions, 139 deletions

diff --git a/winsup/mingw/moldname-msvcrt.def b/winsup/mingw/moldname-msvcrt.def
index 0e0d39c31..c341d2e11 100644
--- a/winsup/mingw/moldname-msvcrt.def
+++ b/winsup/mingw/moldname-msvcrt.def
@@ -1,139 +1,142 @@
-;
-; moldname-msvcrt.def 
-;
-; Exports from the runtime except that these exports are actually preceeded
-; by a underscore in the actual DLL. These correspond to functions which
-; are non-ANSI and were prefixed with an underscore to avoid name space
-; clutter. However many, in fact most programs still use a few of these
-; functions without the underscore. This .def file is specially processed
-; to make those non-underscored name function calls call the equivalent
-; underscored functions.
-;
-; Contributors:
-;  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-;  Maintained by Mumit Khan <khan@xraylith.wisc.edu>
-;
-;  THIS SOFTWARE IS NOT COPYRIGHTED
-;
-;  This source code is offered for use in the public domain. You may
-;  use, modify or distribute it freely.
-;
-;  This code is distributed in the hope that it will be useful but
-;  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-;  DISCLAMED. This includes but is not limited to warrenties of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;
-EXPORTS
-access
-beep
-cabs
-chdir
-chmod
-chsize
-close
-creat
-cwait
-
-daylight DATA
-
-dup
-dup2
-ecvt
-eof
-execl
-execle
-execlp
-execlpe
-execv
-execve
-execvp
-execvpe
-fcvt
-fdopen
-fgetchar
-fgetwchar
-filelength
-fileno
-fpreset
-fputchar
-fputwchar
-fstat
-ftime
-gcvt
-getch
-getche
-getcwd
-getpid
-getw
-heapwalk
-hypot
-isatty
-itoa
-j0
-j1
-jn
-kbhit
-lseek
-ltoa
-memccpy
-memicmp
-mkdir
-mktemp
-open
-pclose
-popen
-putch
-putenv
-putw
-read
-rmdir
-searchenv
-seterrormode
-setmode
-sleep
-sopen
-spawnl
-spawnle
-spawnlp
-spawnlpe
-spawnv
-spawnve
-spawnvp
-spawnvpe
-stat
-strcmpi
-strdup
-stricmp
-stricoll
-strlwr
-strnicmp
-strnset
-strrev
-strset
-strupr
-swab
-tell
-tempnam
-
-timezone DATA
-
-; export tzname for both. See <time.h>
-tzname DATA
-tzset
-umask
-ungetch
-unlink
-utime
-wcsdup
-wcsicmp
-wcsicoll
-wcslwr
-wcsnicmp
-wcsnset
-wcsrev
-wcsset
-wcsupr
-write
-y0
-y1
-yn
+;

+; moldname-msvcrt.def

+;

+; Exports from the runtime except that these exports are actually preceeded

+; by a underscore in the actual DLL. These correspond to functions which

+; are non-ANSI and were prefixed with an underscore to avoid name space

+; clutter. However many, in fact most programs still use a few of these

+; functions without the underscore. This .def file is specially processed

+; to make those non-underscored name function calls call the equivalent

+; underscored functions.

+;

+; Contributors:

+; Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>

+; Maintained by Mumit Khan <khan@xraylith.wisc.edu>

+;

+; THIS SOFTWARE IS NOT COPYRIGHTED

+;

+; This source code is offered for use in the public domain. You may

+; use, modify or distribute it freely.

+;

+; This code is distributed in the hope that it will be useful but

+; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY

+; DISCLAMED. This includes but is not limited to warrenties of

+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+;

+EXPORTS

+access

+beep

+cabs

+chdir

+chmod

+chsize

+close

+creat

+cwait

+

+daylight DATA

+

+dup

+dup2

+ecvt

+eof

+execl

+execle

+execlp

+execlpe

+execv

+execve

+execvp

+execvpe

+fcvt

+fdopen

+fgetchar

+fgetwchar

+filelength

+fileno

+fpreset

+fputchar

+fputwchar

+fstat

+ftime

+gcvt

+getch

+getche

+getcwd

+getpid

+getw

+heapwalk

+hypot

+isatty

+itoa

+j0

+j1

+jn

+kbhit

+lseek

+ltoa

+memccpy

+memicmp

+mkdir

+mktemp

+open

+pclose

+popen

+putch

+putenv

+putw

+read

+rmdir

+searchenv

+seterrormode

+setmode

+sleep

+sopen

+spawnl

+spawnle

+spawnlp

+spawnlpe

+spawnv

+spawnve

+spawnvp

+spawnvpe

+stat

+strcmpi

+strdup

+stricmp

+stricoll

+strlwr

+strnicmp

+strnset

+strrev

+strset

+strupr

+swab

+tell

+tempnam

+

+timezone DATA

+

+; export tzname for both. See <time.h>

+tzname DATA

+tzset

+umask

+ungetch

+unlink

+utime

+wcsdup

+wcsicmp

+wcsicoll

+wcslwr

+wcsnicmp

+wcsnset

+wcsrev

+wcsset

+wcsupr

+

+wpopen

+

+write

+y0

+y1

+yn