mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".

The branch, legacy has been updated
       via  9f2e6762930506d66a0d3c5ed81eac5b240b3a31 (commit)
       via  20ac96de8bb0591eabe630e7627c1427c387730d (commit)
       via  45d80b96fdcd7430a536a4ec6cf261bad4ded8a5 (commit)
       via  b2694c7ef681ded1d54cacaa8b8e1ad38da01351 (commit)
      from  280f64d4e5c530e40d7c80264cc4da3cf6d48c12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/9f2e6762930506d66a0d3c5ed81eac5b240b3a31/

commit 9f2e6762930506d66a0d3c5ed81eac5b240b3a31
Author: Keith Marshall <kei...@us...>
Date:   Mon Mar 28 18:10:58 2016 +0100

    Factor out <wchar.h> vs. <direct.h> duplicate declarations.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index e92239d..2033a18 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,17 @@
+2016-03-28  Keith Marshall  <kei...@us...>
+
+	Factor out <wchar.h> vs. <direct.h> duplicate declarations.
+
+	* include/direct.h: Conditionally partition it, such that...
+	[__WCHAR_H_SOURCED__] (_DIRECT_H): Do not define it; declare only...
+	(_wchdir, wchar_t, wchar_t, _wmkdir, _wrmdir): ...these, otherwise...
+	[!__WCHAR_H_SOURCED__] (_DIRECT_H): Define it; expose all content.
+	(_WDIRECT_DEFINED): Never define it; delete all references.
+
+	* include/wchar.h (_WDIRECT_DEFINED): Delete all references.
+	(_wchdir, wchar_t, wchar_t, _wmkdir, _wrmdir): Delete prototypes;
+	selectively #include <direct.h> to reproduce them.
+
 2016-03-26  Keith Marshall  <kei...@us...>
 
 	Factor out <direct.h> vs. <dos.h> duplicate declarations.
diff --git a/mingwrt/include/direct.h b/mingwrt/include/direct.h
index 0a10b41..3954033 100644
--- a/mingwrt/include/direct.h
+++ b/mingwrt/include/direct.h
@@ -32,6 +32,14 @@
  */
 #ifndef _DIRECT_H
 #pragma GCC system_header
+
+/* In addition to inclusion in its own right, this header supports
+ * selective inclusion by <wchar.h>; thus...
+ */
+#ifndef __WCHAR_H_SOURCED__
+ /* ...we defer definition of the normal multiple inclusion guard,
+  * until we know that this is NOT a selective inclusion request.
+  */
 #define _DIRECT_H
 
 #define __DIRECT_H_SOURCED__
@@ -45,32 +53,43 @@
 #include <dos.h>
 
 #undef __DIRECT_H_SOURCED__
+#endif	/* !__WCHAR_H_SOURCED__ */
+
 #ifndef RC_INVOKED
 
 _BEGIN_C_DECLS
 
-/* Functions for manipulating disk drive selection.
+#ifdef _DIRECT_H
+/* Functions for manipulating disk drive selection; these are declared
+ * only when <direct.h> is included in its own right.
  */
 _CRTIMP __cdecl __MINGW_NOTHROW  int _getdrive (void);
 _CRTIMP __cdecl __MINGW_NOTHROW  unsigned long _getdrives(void);
 _CRTIMP __cdecl __MINGW_NOTHROW  int _chdrive (int);
 _CRTIMP __cdecl __MINGW_NOTHROW  char *_getdcwd (int, char*, int);
 
-/* The following group of functions  are available only within
- * MSVCRT.DLL, (i.e. they are NOT provided by CRTDLL.DLL); they
- * are also declared in <wchar.h>, hence avoid declaring them a
- * second time.
- */
-#if defined __MSVCRT__ && ! defined _WDIRECT_DEFINED
+#endif	/* _DIRECT_H */
 
+/* The following group of function prototypes are to be declared
+ * either when including <dirent.h> in its own right, or when it
+ * is included selectively by <wchar.h>; however...
+ */
+#if defined __MSVCRT__ && ! (defined _DIRENT_H && defined _WCHAR_H)
+ /*
+  * ...they are available only within MSVCRT.DLL, (i.e. they are
+  * NOT provided by CRTDLL.DLL), and if both _DIRENT_H and _WCHAR_H
+  * are already defined, by the time we get to here, then this must
+  * be an inclusion of <dirent.h> in its own right, AFTER they have
+  * already been declared on behalf of <wchar.h>; there is no need
+  * to declare them again.
+  */
 _CRTIMP __cdecl __MINGW_NOTHROW  int _wchdir (const wchar_t *);
 _CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_wgetcwd (wchar_t *, int);
 _CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_wgetdcwd (int, wchar_t *, int);
 _CRTIMP __cdecl __MINGW_NOTHROW  int _wmkdir (const wchar_t *);
 _CRTIMP __cdecl __MINGW_NOTHROW  int _wrmdir (const wchar_t *);
 
-#define _WDIRECT_DEFINED
-#endif	/* __MSVCRT__ && !_WDIRECT_DEFINED */
+#endif	/* __MSVCRT__ && ! (defined _DIRENT_H && defined _WCHAR_H) */
 
 _END_C_DECLS
 
diff --git a/mingwrt/include/wchar.h b/mingwrt/include/wchar.h
index 0828853..47c9c22 100644
--- a/mingwrt/include/wchar.h
+++ b/mingwrt/include/wchar.h
@@ -174,6 +174,19 @@
  *  long double wcstold (const wchar_t *restrict, wchar_t **restrict);
  *
  *
+ * while from...
+ */
+#include <direct.h>
+/* ...we obtain prototypes for each of the following functions,
+ * (none of which are available when using CRTDLL.DLL):
+ *
+ *  int _wchdir (const wchar_t *);
+ *  wchar_t *_wgetcwd (wchar_t *, int);
+ *  wchar_t *_wgetdcwd (int, wchar_t *, int);
+ *  int _wmkdir (const wchar_t *);
+ *  int _wrmdir (const wchar_t *);
+ *
+ *
  * Again, in similar fashion, from...
  */
 #include <time.h>
@@ -487,18 +500,6 @@ _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddat
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
-#ifndef _WDIRECT_DEFINED
-/* Also in direct.h */
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl __MINGW_NOTHROW	  _wchdir (const wchar_t*);
-_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetcwd (wchar_t*, int);
-_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetdcwd (int, wchar_t*, int);
-_CRTIMP int __cdecl __MINGW_NOTHROW	  _wmkdir (const wchar_t*);
-_CRTIMP int __cdecl __MINGW_NOTHROW	  _wrmdir (const wchar_t*);
-#endif	/* __MSVCRT__ */
-#define _WDIRECT_DEFINED
-#endif /* _WDIRECT_DEFINED */
-
 #ifndef _STAT_DEFINED
 /*
  * The structure manipulated and returned by stat and fstat.

https://sf.net/p/mingw/mingw-org-wsl/ci/20ac96de8bb0591eabe630e7627c1427c387730d/

commit 20ac96de8bb0591eabe630e7627c1427c387730d
Author: Keith Marshall <kei...@us...>
Date:   Sat Mar 26 20:54:49 2016 +0000

    Factor out <direct.h> vs. <dos.h> duplicate declarations.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index 0033fdb..e92239d 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,40 @@
 2016-03-26  Keith Marshall  <kei...@us...>
 
+	Factor out <direct.h> vs. <dos.h> duplicate declarations.
+
+	* include/dos.h: Assert copyright; tidy layout.
+	(pragma GCC system_header): Declare it.
+	(_DOS_H_): Rename multiple inclusion guard macro, to adopt...
+	(_DOS_H): ...this preferred convention; do not define it when...
+	[__DIRECT_H_SOURCED__]: ...this applies; restrict declarations to...
+	(struct _diskfree_t): ...this aggregate data type, together with...
+	[_NO_OLDNAMES] (diskfree_t): ...this alternative name for it, and...
+	(_getdiskfree): ...this associated function.
+	[!__DIRECT_H_SOURCED__] (_DOS_H): Define it; expose all content, but
+	emit a warning that this header is obsolete, and should not be used.
+	(_BEGIN_C_DECLS, _END_C_DECLS): Use to wrap extern "C" declarations.
+	(_DISKFREE_T_DEFINED): Do not define it; delete all references.
+	(__need_wchar_t): Do not define it; it isn't needed here, and hence,
+	neither is it necessary to #include <stddef.h>; do not do so.  Also,
+	do not #include <_mingw.h> explicitly, but always #include <io.h>,
+	which will implicitly #include <_mingw.h> anyway.
+
+	* include/direct.h: Assert copyright; tidy layout.
+	(pragma GCC system_header): Declare it.
+	(_DIRECT_H_): Rename this multiple inclusion guard macro...
+	(_DIRECT_H): ...to adopt this preferred naming convention.
+	(_BEGIN_C_DECLS, _END_C_DECLS): Use to wrap extern "C" declarations.
+	(_DISKFREE_T_DEFINED, diskfree_t, struct _diskfree_t): Do not define.
+	(_getdiskfree): Likewise, do not declare prototype; instead...
+	(__DIRECT_H_SOURCED__): ...define this, and #include <dos.h>; also
+	delegate indirect inclusion of <_mingw.h> and <io.h> to this, rather
+	than include them directly; undefine __DIRECT_H_SOURCED__ when done.
+	(__need_wchar_t): Do not define it, and do not #include <stddef.h>;
+	although needed, we may inherit it indirectly from <sys/types.h>,
+	included by <io.h> via <dos.h>.
+
+2016-03-26  Keith Marshall  <kei...@us...>
+
 	Evade CPP mismatched apostrophe warnings in windres comments.
 
 	* msvcrt-xref/msvcrt.def.in (; pexports): 1,Gs/doesn't/does not/g
diff --git a/mingwrt/include/direct.h b/mingwrt/include/direct.h
index 86cd042..0a10b41 100644
--- a/mingwrt/include/direct.h
+++ b/mingwrt/include/direct.h
@@ -1,73 +1,78 @@
 /*
  * direct.h
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
  *
- * Functions for manipulating paths and directories (included from io.h)
- * plus functions for setting the current drive.
+ * Functions for manipulating paths and directories, (included from io.h),
+ * and functions for manipulating the current drive assignment.
+ *
+ * $Id$
+ *
+ * Written by Rob Savoye <ro...@cy...>
+ * Copyright (C) 1997, 1999-2001, 2003, 2004, 2007, 2016, MinGW.org Project.
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef	_DIRECT_H_
-#define	_DIRECT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
+#ifndef _DIRECT_H
+#pragma GCC system_header
+#define _DIRECT_H
 
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-#include <io.h>
+#define __DIRECT_H_SOURCED__
+/* All MinGW headers are required to include <_mingw.h>; additionally,
+ * much of the content which we need here is defined in <io.h>, but we
+ * also need the declaration of the _getdiskfree() function prototype,
+ * and the definition for its associated _diskfree_t data structure,
+ * from <dos.h>; thus, we may simply include <dos.h> here, and let
+ * it take care of including both <mingw.h> and <io.h> for us.
+ */
+#include <dos.h>
 
+#undef __DIRECT_H_SOURCED__
 #ifndef RC_INVOKED
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
+_BEGIN_C_DECLS
 
-#ifndef _DISKFREE_T_DEFINED
-/* needed by _getdiskfree (also in dos.h) */
-struct _diskfree_t {
-	unsigned total_clusters;
-	unsigned avail_clusters;
-	unsigned sectors_per_cluster;
-	unsigned bytes_per_sector;
-};
-#define _DISKFREE_T_DEFINED
-#endif
+/* Functions for manipulating disk drive selection.
+ */
+_CRTIMP __cdecl __MINGW_NOTHROW  int _getdrive (void);
+_CRTIMP __cdecl __MINGW_NOTHROW  unsigned long _getdrives(void);
+_CRTIMP __cdecl __MINGW_NOTHROW  int _chdrive (int);
+_CRTIMP __cdecl __MINGW_NOTHROW  char *_getdcwd (int, char*, int);
 
-/*
- * You really shouldn't be using these. Use the Win32 API functions instead.
- * However, it does make it easier to port older code.
+/* The following group of functions  are available only within
+ * MSVCRT.DLL, (i.e. they are NOT provided by CRTDLL.DLL); they
+ * are also declared in <wchar.h>, hence avoid declaring them a
+ * second time.
  */
-_CRTIMP int __cdecl __MINGW_NOTHROW _getdrive (void);
-_CRTIMP unsigned long __cdecl __MINGW_NOTHROW _getdrives(void);
-_CRTIMP int __cdecl __MINGW_NOTHROW _chdrive (int);
-_CRTIMP char* __cdecl __MINGW_NOTHROW _getdcwd (int, char*, int);
-_CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfree_t *);
+#if defined __MSVCRT__ && ! defined _WDIRECT_DEFINED
 
-#ifndef	_NO_OLDNAMES
-# define diskfree_t _diskfree_t
-#endif
+_CRTIMP __cdecl __MINGW_NOTHROW  int _wchdir (const wchar_t *);
+_CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_wgetcwd (wchar_t *, int);
+_CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_wgetdcwd (int, wchar_t *, int);
+_CRTIMP __cdecl __MINGW_NOTHROW  int _wmkdir (const wchar_t *);
+_CRTIMP __cdecl __MINGW_NOTHROW  int _wrmdir (const wchar_t *);
 
-#ifndef _WDIRECT_DEFINED
-/* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
-_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
-_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
-_CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
-_CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
+#endif	/* __MSVCRT__ && !_WDIRECT_DEFINED */
 
-#endif	/* Not RC_INVOKED */
+_END_C_DECLS
 
-#endif	/* Not _DIRECT_H_ */
+#endif	/* ! RC_INVOKED */
+#endif  /* !_DIRECT_H: $RCSfile$: end of file */
diff --git a/mingwrt/include/dos.h b/mingwrt/include/dos.h
index e6bf561..468af73 100644
--- a/mingwrt/include/dos.h
+++ b/mingwrt/include/dos.h
@@ -1,35 +1,78 @@
 /*
  * dos.h
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
  *
- * DOS-specific functions and structures.
+ * Functions and structures inherited from MS-DOS.
+ *
+ * $Id$
+ *
+ * Written by Jan-Jaap van der Heijden
+ * Copyright (C) 1997-1999, 2001-2004, 2007, 2016, MinGW.org Project.
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  */
-
-#ifndef	_DOS_H_
-#define	_DOS_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-/* For DOS file attributes */
+#ifndef	_DOS_H
+#pragma GCC system_header
+
+/* This header supports selective inclusion by <direct.h>, for delegated
+ * access to the content of <io.h>, and for declaration of the prototype
+ * and associated data structure for the _getdiskfree() function; since
+ * including <dos.h> in this manner does not make all of its content
+ * visible, we defer definition of its multiple inclusion guard...
+ */
+#ifndef __DIRECT_H_SOURCED__
+ /* ...until we have determined that this inclusion is NOT a selective
+  * request from <direct.h>; in spite of it being obsolete, it appears
+  * that the user may have included <dos.h> directly.
+  */
+#define	_DOS_H
+#warning "<dos.h> is obsolete; consider using <direct.h> instead."
+#endif	/* !__DIRECT_H_SOURCED__ */
+
+/* All MinGW headers are required to include <_mingw.h>; additionally,
+ * for DOS file attributes, we must include <io.h>.  By unconditionally
+ * including <io.h> here, we may delegate the inclusion of <_mingw.h> to
+ * it, while also allowing <direct.h> to delegate responsibility for the
+ * inclusion of both <_mingw.h> and <io.h> to us.
+ */
 #include <io.h>
 
 #ifndef RC_INVOKED
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+_BEGIN_C_DECLS
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
+/* The following declarations are to be visible ONLY when <dos.h>
+ * is included in its own right; they represent entities which are
+ * present in CRTDLL.DLL, but not in MSVCRT.DLL
+ */
+#if defined _DOS_H && ! defined __MSVCRT__
 #ifndef __DECLSPEC_SUPPORTED
+
+# define _basemajor    (*_imp___basemajor_dll)
+# define _baseminor    (*_imp___baseminor_dll)
+# define _baseversion  (*_imp___baseversion_dll)
+# define _osmajor      (*_imp___osmajor_dll)
+# define _osminor      (*_imp___osminor_dll)
+# define _osmode       (*_imp___osmode_dll)
+
 extern unsigned int *_imp___basemajor_dll;
 extern unsigned int *_imp___baseminor_dll;
 extern unsigned int *_imp___baseversion_dll;
@@ -37,15 +80,15 @@ extern unsigned int *_imp___osmajor_dll;
 extern unsigned int *_imp___osminor_dll;
 extern unsigned int *_imp___osmode_dll;
 
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
 #else /* __DECLSPEC_SUPPORTED */
 
+# define _basemajor    _basemajor_dll
+# define _baseminor    _baseminor_dll
+# define _baseversion  _baseversion_dll
+# define _osmajor      _osmajor_dll
+# define _osminor      _osminor_dll
+# define _osmode       _osmode_dll
+
 __MINGW_IMPORT unsigned int _basemajor_dll;
 __MINGW_IMPORT unsigned int _baseminor_dll;
 __MINGW_IMPORT unsigned int _baseversion_dll;
@@ -53,37 +96,41 @@ __MINGW_IMPORT unsigned int _osmajor_dll;
 __MINGW_IMPORT unsigned int _osminor_dll;
 __MINGW_IMPORT unsigned int _osmode_dll;
 
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
-#ifndef _DISKFREE_T_DEFINED
-/* needed by _getdiskfree (also in direct.h) */
-struct _diskfree_t {
-	unsigned total_clusters;
-	unsigned avail_clusters;
-	unsigned sectors_per_cluster;
-	unsigned bytes_per_sector;
-};
-#define _DISKFREE_T_DEFINED
-#endif
-
-_CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfree_t *);
+#endif	/* __DECLSPEC_SUPPORTED */
+#endif	/* _DOS_H && !__MSVCRT__ */
 
+/* The following section, which declares the _getdiskfree() function
+ * prototype, and also defines its associated _diskfree_t data structure,
+ * is to be processed both when including <dos.h> in its own right, and
+ * when selectively included by <direct.h>; however...
+ */
+#if ! (defined _DOS_H && defined _DIRECT_H)
+ /* ...when both the _DOS_H guard, and the _DIRECT_H multiple inclusion
+  * guards have been defined, by the time we get to here, then this is
+  * <dos.h> inclusion in its own right, and we have ALREADY processed
+  * these definitions through selective inclusion by <direct.h>; we
+  * MUST NOT process them a second time.
+  */
 #ifndef	_NO_OLDNAMES
-# define diskfree_t _diskfree_t
+# define diskfree_t  _diskfree_t
 #endif
 
-#ifdef __cplusplus
-}
-#endif
+struct _diskfree_t
+{ /* A structure in which to store information about disk
+   * free space, as returned by the _getdiskfree() function.
+   */
+  unsigned total_clusters;
+  unsigned avail_clusters;
+  unsigned sectors_per_cluster;
+  unsigned bytes_per_sector;
+};
+
+_CRTIMP __cdecl __MINGW_NOTHROW
+unsigned _getdiskfree (unsigned, struct _diskfree_t *);
+
+#endif	/* ! ( _DOS_H && _DIRECT_H) */
 
-#endif	/* Not RC_INVOKED */
+_END_C_DECLS
 
-#endif	/* Not _DOS_H_ */
+#endif	/* ! RC_INVOKED */
+#endif  /* !_DOS_H: $RCSfile$: end of file */

https://sf.net/p/mingw/mingw-org-wsl/ci/45d80b96fdcd7430a536a4ec6cf261bad4ded8a5/

commit 45d80b96fdcd7430a536a4ec6cf261bad4ded8a5
Author: Keith Marshall <kei...@us...>
Date:   Sat Mar 26 13:42:20 2016 +0000

    Evade CPP mismatched apostrophe warnings in windres comments.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index f2d9fa6..0033fdb 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-26  Keith Marshall  <kei...@us...>
+
+	Evade CPP mismatched apostrophe warnings in windres comments.
+
+	* msvcrt-xref/msvcrt.def.in (; pexports): 1,Gs/doesn't/does not/g
+
 2016-03-20  Keith Marshall  <kei...@us...>
 
 	Factor out <locale.h> vs. <wchar.h> duplicate declarations.
@@ -5,8 +11,8 @@
 	* include/locale.h: Assert copyright; tidy layout.
 	(_LOCALE_H_): Rename multiple inclusion guard macro, to...
 	(_LOCALE_H): ...this; do not define it when...
-	[__WCHAR_H_SOURCED__]: ...this applies; restrict declarations...
-	(_wsetlocale): ...to just this one visible function prototype.
+	[__WCHAR_H_SOURCED__]: ...this applies; restrict declarations to...
+	(_wsetlocale): ...just this one visible function prototype.
 	[!__WCHAR_H_SOURCED__] (_LOCALE_H): Define it; expose all content.
 	(_WLOCALE_DEFINED): Do not define it; delete all references.
 	(pragma GCC system_header): Declare it.
diff --git a/mingwrt/msvcrt-xref/msvcrt.def.in b/mingwrt/msvcrt-xref/msvcrt.def.in
index d2bffdf..fcb586f 100644
--- a/mingwrt/msvcrt-xref/msvcrt.def.in
+++ b/mingwrt/msvcrt-xref/msvcrt.def.in
@@ -1911,7 +1911,7 @@ _msize_debug
 # endif
 #endif
 _nextafter
-; pexports doesn't report it as such, but libmsvcrt.a needs
+; pexports does not report it as such, but libmsvcrt.a needs
 ; _onexit to be qualified as DATA.
 _onexit DATA
 _open
@@ -2916,7 +2916,7 @@ atanh
 atanhf
 atanhl
 #endif
-; pexports doesn't report it as such, but libmsvcrt.a needs
+; pexports does not report it as such, but libmsvcrt.a needs
 ; atexit to be qualified as DATA.
 atexit DATA
 atof

https://sf.net/p/mingw/mingw-org-wsl/ci/b2694c7ef681ded1d54cacaa8b8e1ad38da01351/

commit b2694c7ef681ded1d54cacaa8b8e1ad38da01351
Author: Keith Marshall <kei...@us...>
Date:   Sun Mar 20 22:13:10 2016 +0000

    Factor out <locale.h> vs. <wchar.h> duplicate declarations.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index a600cd0..f2d9fa6 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,20 @@
+2016-03-20  Keith Marshall  <kei...@us...>
+
+	Factor out <locale.h> vs. <wchar.h> duplicate declarations.
+
+	* include/locale.h: Assert copyright; tidy layout.
+	(_LOCALE_H_): Rename multiple inclusion guard macro, to...
+	(_LOCALE_H): ...this; do not define it when...
+	[__WCHAR_H_SOURCED__]: ...this applies; restrict declarations...
+	(_wsetlocale): ...to just this one visible function prototype.
+	[!__WCHAR_H_SOURCED__] (_LOCALE_H): Define it; expose all content.
+	(_WLOCALE_DEFINED): Do not define it; delete all references.
+	(pragma GCC system_header): Declare it.
+
+	* include/wchar.h (_wsetlocale): Delete prototype; maintain its
+	visibility by selective inclusion of <locale.h> instead.
+	(_WLOCALE_DEFINED): Delete all references.
+
 2016-03-18  Keith Marshall  <kei...@us...>
 
 	Resolve some "implicit function declaration" warnings.
diff --git a/mingwrt/include/locale.h b/mingwrt/include/locale.h
index 31c6df2..b756a19 100644
--- a/mingwrt/include/locale.h
+++ b/mingwrt/include/locale.h
@@ -1,28 +1,51 @@
 /*
  * locale.h
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
  *
  * Functions and types for localization (ie. changing the appearance of
- * output based on the standards of a certain country).
+ * output based on the standards of a certain country, or region).
+ *
+ * $Id$
+ *
+ * Written by Rob Savoye <ro...@cy...>
+ * Copyright (C) 1997, 1999-2001, 2003, 2004, 2007, 2016, MinGW.org Project.
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  */
+#ifndef	_LOCALE_H
+#pragma GCC system_header
 
-#ifndef	_LOCALE_H_
-#define	_LOCALE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
+/* Content from <locale.h> is selectively shared with <wchar.h>;
+ * defer definition of the normal repeat inclusion guard, until...
+ */
+#ifndef __WCHAR_H_SOURCED__
+ /* ...we have confirmed that this inclusion is NOT the <wchar.h>
+  * selective request.
+  */
+#define	_LOCALE_H
 
-/*
- * NOTE: I have tried to test this, but I am limited by my knowledge of
- *       locale issues. The structure does not bomb if you look at the
- *       values, and 'decimal_point' even seems to be correct. But the
- *       rest of the values are, by default, not particularly useful
- *       (read meaningless and not related to the international settings
- *       of the system).
+/* All MinGW headers should include <_mingw.h>; do so only when NOT
+ * sourced by <wchar.h>, (which should have included it already).
  */
+#include <_mingw.h>
 
 #define	LC_ALL		0
 #define LC_COLLATE	1
@@ -34,55 +57,70 @@
 #define	LC_MAX		LC_TIME
 
 #ifndef RC_INVOKED
-
-/* According to C89 std, NULL is defined in locale.h too.  */
+/* Both ISO-C and POSIX stipulate that <locale.h> should reproduce the
+ * definition of NULL, from <stddef.h>; although not required by either
+ * standard, we also require wchar_t, to support our declaration of the
+ * Microsoft specific _wsetlocale() function, below.
+ */
 #define __need_NULL
+#define __need_wchar_t
 #include <stddef.h>
 
-/*
- * The structure returned by 'localeconv'.
- */
 struct lconv
-{
-	char*	decimal_point;
-	char*	thousands_sep;
-	char*	grouping;
-	char*	int_curr_symbol;
-	char*	currency_symbol;
-	char*	mon_decimal_point;
-	char*	mon_thousands_sep;
-	char*	mon_grouping;
-	char*	positive_sign;
-	char*	negative_sign;
-	char	int_frac_digits;
-	char	frac_digits;
-	char	p_cs_precedes;
-	char	p_sep_by_space;
-	char	n_cs_precedes;
-	char	n_sep_by_space;
-	char	p_sign_posn;
-	char	n_sign_posn;
+{ /* The structure returned by the localeconv() function.
+   *
+   * AUTHOR'S NOTE:
+   * I have tried to test this, but I am limited by my knowledge of
+   * locale issues. The structure does not bomb if you look at the
+   * values, and 'decimal_point' even seems to be correct, but the
+   * rest of the values may, by default, not be particularly useful;
+   * indeed, they may even be meaningless, and in no way related to
+   * the international settings of the system.
+   */
+  char	*decimal_point;
+  char	*thousands_sep;
+  char	*grouping;
+  char	*int_curr_symbol;
+  char	*currency_symbol;
+  char	*mon_decimal_point;
+  char	*mon_thousands_sep;
+  char	*mon_grouping;
+  char	*positive_sign;
+  char	*negative_sign;
+  char	 int_frac_digits;
+  char	 frac_digits;
+  char	 p_cs_precedes;
+  char	 p_sep_by_space;
+  char	 n_cs_precedes;
+  char	 n_sep_by_space;
+  char	 p_sign_posn;
+  char	 n_sign_posn;
 };
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
+#endif	/* ! RC_INVOKED */
+#endif	/* !__WCHAR_H_SOURCED__ */
+
+#ifndef RC_INVOKED
 
-_CRTIMP  char* __cdecl __MINGW_NOTHROW setlocale (int, const char*);
-_CRTIMP struct lconv* __cdecl __MINGW_NOTHROW localeconv (void);
+_BEGIN_C_DECLS
 
-#ifndef _WLOCALE_DEFINED  /* also declared in wchar.h */
-# define __need_wchar_t
-# include <stddef.h>
-  _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wsetlocale(int, const wchar_t*);
-# define _WLOCALE_DEFINED
-#endif /* ndef _WLOCALE_DEFINED */
+#ifdef _LOCALE_H
+ /* The following pair of function prototypes are to be declared
+  * only when including <locale.h> in its own right, (i.e. when NOT
+  * sourced by <wchar.h>)...
+  */
+_CRTIMP __cdecl __MINGW_NOTHROW  char *setlocale (int, const char *);
+_CRTIMP __cdecl __MINGW_NOTHROW  struct lconv *localeconv (void);
 
-#ifdef	__cplusplus
-}
 #endif
+ /* ...whereas, this must be declared in either case; (note that it
+  * not necessary to guard against a possible repeat declaration, as
+  * the compiler should accept this, without complaint, provided any
+  * prior declaration is consistent).
+  */
+_CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_wsetlocale (int, const wchar_t *);
 
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _LOCALE_H_ */
+_END_C_DECLS
 
+#endif	/* ! RC_INVOKED */
+#endif  /* !_LOCALE_H: $RCSfile$: end of file */
diff --git a/mingwrt/include/wchar.h b/mingwrt/include/wchar.h
index 3b2f385..0828853 100644
--- a/mingwrt/include/wchar.h
+++ b/mingwrt/include/wchar.h
@@ -209,6 +209,14 @@
  * _wctime() itself, as an in-line alias for its corresponding
  * replacement library function.
  *
+ *
+ * Also, from...
+ */
+#include <locale.h>
+/* ...we obtain the declaration for:
+ *
+ *   wchar_t *_wsetlocale (int, const wchar_t *);
+ *
  */
 _BEGIN_C_DECLS
 
@@ -639,11 +647,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _sta
 #define _WSTAT_DEFINED
 #endif /* ! _WSTAT_DEFIND  */
 
-#ifndef _WLOCALE_DEFINED  /* also declared in locale.h */
-_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wsetlocale (int, const wchar_t*);
-#define _WLOCALE_DEFINED
-#endif
-
 #ifndef _WPROCESS_DEFINED
 /* Also declared in process.h; FIXME: to be factored out.
  */

-----------------------------------------------------------------------

Summary of changes:
 mingwrt/ChangeLog                 |   72 +++++++++++++++++
 mingwrt/include/direct.h          |  134 ++++++++++++++++++-------------
 mingwrt/include/dos.h             |  159 ++++++++++++++++++++++++-------------
 mingwrt/include/locale.h          |  150 ++++++++++++++++++++++-------------
 mingwrt/include/wchar.h           |   38 +++++----
 mingwrt/msvcrt-xref/msvcrt.def.in |    4 +-
 6 files changed, 371 insertions(+), 186 deletions(-)


hooks/post-receive
-- 
Repository: mingw-org-wsl




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (12)
2001	Jan (13)	Feb (2)	Mar (1)	Apr (1)	May	Jun (38)	Jul (10)	Aug (70)	Sep (63)	Oct (61)	Nov (41)	Dec (28)
2002	Jan (43)	Feb (11)	Mar (9)	Apr (2)	May (97)	Jun (94)	Jul (13)	Aug (49)	Sep (41)	Oct (24)	Nov (55)	Dec (126)
2003	Jan (90)	Feb (75)	Mar (32)	Apr (24)	May (54)	Jun (54)	Jul (22)	Aug (4)	Sep (16)	Oct (8)	Nov (6)	Dec (13)
2004	Jan	Feb (17)	Mar (60)	Apr (21)	May (12)	Jun	Jul (13)	Aug	Sep (29)	Oct	Nov	Dec (2)
2005	Jan (22)	Feb (3)	Mar (2)	Apr (13)	May (82)	Jun (18)	Jul (30)	Aug (17)	Sep (3)	Oct (19)	Nov (4)	Dec (8)
2006	Jan (1)	Feb (6)	Mar (2)	Apr (40)	May	Jun (21)	Jul (1)	Aug (410)	Sep (3)	Oct	Nov (56)	Dec (7)
2007	Jan (19)	Feb	Mar (4)	Apr (8)	May (19)	Jun (6)	Jul (4)	Aug (6)	Sep	Oct (4)	Nov (3)	Dec (2)
2008	Jan (13)	Feb (18)	Mar (12)	Apr	May (2)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2009	Jan	Feb (6)	Mar (8)	Apr (2)	May (2)	Jun	Jul	Aug (2)	Sep (11)	Oct (13)	Nov (17)	Dec (6)
2010	Jan (24)	Feb (10)	Mar (27)	Apr (20)	May (108)	Jun (8)	Jul (23)	Aug (38)	Sep (49)	Oct (17)	Nov (12)	Dec (14)
2011	Jan (17)	Feb (7)	Mar (28)	Apr (8)	May (20)	Jun (11)	Jul (7)	Aug (12)	Sep (4)	Oct (20)	Nov (19)	Dec (2)
2012	Jan (2)	Feb (6)	Mar (5)	Apr (24)	May (5)	Jun (4)	Jul (6)	Aug (18)	Sep (38)	Oct (26)	Nov (12)	Dec (6)
2013	Jan (19)	Feb (18)	Mar (44)	Apr (35)	May (18)	Jun (21)	Jul (10)	Aug (19)	Sep (44)	Oct (25)	Nov (1)	Dec (2)
2014	Jan (8)	Feb	Mar	Apr (5)	May (1)	Jun (3)	Jul	Aug (3)	Sep	Oct (4)	Nov (4)	Dec (7)
2015	Jan	Feb	Mar (1)	Apr	May (2)	Jun (4)	Jul (6)	Aug (2)	Sep (8)	Oct (2)	Nov (1)	Dec (3)
2016	Jan (7)	Feb (9)	Mar (5)	Apr (5)	May (9)	Jun (4)	Jul (20)	Aug (4)	Sep (7)	Oct (6)	Nov (9)	Dec (2)
2017	Jan (7)	Feb (7)	Mar (5)	Apr	May (1)	Jun (4)	Jul (12)	Aug (4)	Sep (1)	Oct (4)	Nov (11)	Dec (14)
2018	Jan (3)	Feb (3)	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec

mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

A native Windows port of the GNU Compiler Collection (GCC)

mingw-cvs — List for CVS update notification

S	M	T	W	T	F	S
		1	2	3	4	5
6	7	8	9	10	11	12
13 (1)	14	15	16 (1)	17 (1)	18 (1)	19
20	21	22	23	24	25	26
27	28	29 (1)	30	31