Declare <dir.h> as formally deprecated.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index 54c41bd..792719b 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,14 @@
 2016-04-06  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
+       Declare <dir.h> as formally deprecated.
+
+       * include/dir.h: Assert copyright.
+       (pragma GCC system_header): Declare it.
+       (_DIR_H): Define as multiple inclusion macro.
+       [!_DIR_H]: Emit "obsolete header" warning message.
+
+2016-04-06  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
        Factor out <wchar.h> vs. <io.h> duplicate declarations.
 
        * include/io.h: Assert copyright; tidy layout.

diff --git a/mingwrt/include/dir.h b/mingwrt/include/dir.h
index 60ab89e..6897d82 100644 (file)
--- a/mingwrt/include/dir.h
+++ b/mingwrt/include/dir.h
@@ -1,26 +1,40 @@
 /*
  * dir.h
  *
- * This file OBSOLESCENT and only provided for backward compatibility.
- * Please use io.h instead.
+ * Obsolete header replaced by <io.h>; this stub is retained for
+ * backward compatibility only.
  *
- * This file is part of the Mingw32 package.
+ * $Id$
  *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *             Mumit Khan <khan@xraylith.wisc.edu>
+ * Written by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
+ * Copyright (C) 1997-1999, 2001, 2016, MinGW.org Project
  *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
  *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
+ * 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:
  *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 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 _DIR_H
+#pragma GCC system_header
+#define _DIR_H
 
+#warning "<dir.h> is obsolete; please use <io.h> instead."
 #include <io.h>
 
+#endif /* !_DIR_H: $RCSfile$: end of file */