* 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.

winsup/mingw/ChangeLog

@@ -1,3 +1,20 @@
+2002-03-26  Danny Smith  <dannysmith@sourceforge.users.net>
+
+	* 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.
+
 2002-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/malloc.h (_heapinfo): Correct structure definition.

winsup/mingw/Makefile.in

@@ -218,13 +218,13 @@ libmingw32.a: $(MINGW_OBJS)
 $(srcdir)/moldname-crtdll.def: moldname.def.in
 	$(CC) -DRUNTIME=crtdll \
 		-D__FILENAME__=moldname-crtdll.def \
-		-D__CRTDLL__  -c -E -P \
+		-D__CRTDLL__  -C -E -P \
 		-xc-header $? > $@
 
 $(srcdir)/moldname-msvcrt.def: moldname.def.in
 	$(CC) -DRUNTIME=msvcrt \
 		-D__FILENAME__=moldname-msvcrt.def \
-		-D__MSVCRT__  -c -E -P \
+		-D__MSVCRT__  -C -E -P \
 		-xc-header $? > $@
 
 libcoldname.a: $(srcdir)/moldname-crtdll.def $(MOLD_OBJS)

winsup/mingw/include/stdio.h

@@ -320,9 +320,11 @@ int	fileno (FILE*);
 int	fwprintf (FILE*, const wchar_t*, ...);
 int	wprintf (const wchar_t*, ...);
 int	swprintf (wchar_t*, const wchar_t*, ...);
+int	_swnprintf (wchar_t*, size_t, const wchar_t*, ...);
 int	vfwprintf (FILE*, const wchar_t*, va_list);
 int	vwprintf (const wchar_t*, va_list);
 int	vswprintf (wchar_t*, const wchar_t*, va_list);
+int	_vswnprintf (wchar_t*, size_t, const wchar_t*, va_list);
 int	fwscanf (FILE*, const wchar_t*, ...);
 int	wscanf (const wchar_t*, ...);
 int	swscanf (const wchar_t*, const wchar_t*, ...);
@@ -354,17 +356,7 @@ FILE*  _wpopen(const wchar_t*, const wchar_t*);
 #ifndef __STRICT_ANSI__
 #ifdef __MSVCRT__
 #ifndef NO_OLDNAMES
-#if 0
 FILE*	wpopen (const wchar_t*, const wchar_t*);
-#else /* Always true */
-/*
- * The above prototypeing is not possible unless the wpopen export is added
- * to moldnames, which can't be done unless we make separate moldnames.def
- * files for every supported runtime. For the time being we use a define
- * instead. Pedro's modified dlltool should take care of this I think.
- */
-#define wpopen _wpopen
-#endif	/* Always true */
 #endif /* not NO_OLDNAMES */
 #endif /* MSVCRT runtime */
 

winsup/mingw/include/wchar.h

@@ -105,9 +105,11 @@ int  _wfindnexti64(long, struct _wfinddatai64_t*);
 int	fwprintf (FILE*, const wchar_t*, ...);
 int	wprintf (const wchar_t*, ...);
 int	swprintf (wchar_t*, const wchar_t*, ...);
+int	_swnprintf (wchar_t*, size_t, const wchar_t*, ...);
 int	vfwprintf (FILE*, const wchar_t*, va_list);
 int	vwprintf (const wchar_t*, va_list);
 int	vswprintf (wchar_t*, const wchar_t*, va_list);
+int	_vswnprintf (wchar_t*, size_t, const wchar_t*, va_list);
 int	fwscanf (FILE*, const wchar_t*, ...);
 int	wscanf (const wchar_t*, ...);
 int	swscanf (const wchar_t*, const wchar_t*, ...);

winsup/mingw/moldname-crtdll.def

@@ -34,6 +34,8 @@ close
 creat
 cwait
 
+
+
 dup
 dup2
 ecvt
@@ -113,6 +115,8 @@ swab
 tell
 tempnam
 
+
+
 ; export tzname for both. See <time.h>
 tzname DATA
 tzset
@@ -129,6 +133,9 @@ wcsnset
 wcsrev
 wcsset
 wcsupr
+
+
+
 write
 y0
 y1

winsup/mingw/moldname-msvcrt.def

@@ -133,6 +133,9 @@ wcsnset
 wcsrev
 wcsset
 wcsupr
+
+wpopen
+
 write
 y0
 y1

winsup/mingw/moldname.def.in

@@ -33,7 +33,7 @@ chsize
 close
 creat
 cwait
-#if (__MSVCRT__) 
+#if !(__CRTDLL__)
 daylight DATA
 #endif
 dup
@@ -114,7 +114,7 @@ strupr
 swab
 tell
 tempnam
-#if (__MSVCRT__) 
+#if  !(__CRTDLL__)
 timezone DATA
 #endif
 ; export tzname for both. See <time.h>
@@ -133,6 +133,9 @@ wcsnset
 wcsrev
 wcsset
 wcsupr
+#if  !(__CRTDLL__)
+wpopen
+#endif
 write
 y0
 y1