Removing a dozen of warnings.

30 files changed, 69 insertions, 3 deletions

diff --git a/MSVC/readline/bind.c b/MSVC/readline/bind.c
index 242b5ba..3b1a150 100644
--- a/MSVC/readline/bind.c
+++ b/MSVC/readline/bind.c
@@ -19,10 +19,16 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/MSVC/readline/callback.c b/MSVC/readline/callback.c
index 85e2ee5..2b1f0fb 100644
--- a/MSVC/readline/callback.c
+++ b/MSVC/readline/callback.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/compat.c b/MSVC/readline/compat.c
index 5e0aec8..424e306 100644
--- a/MSVC/readline/compat.c
+++ b/MSVC/readline/compat.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/complete.c b/MSVC/readline/complete.c
index 0d918a1..53b2a53 100644
--- a/MSVC/readline/complete.c
+++ b/MSVC/readline/complete.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/display.c b/MSVC/readline/display.c
index 0e9a116..69a1541 100644
--- a/MSVC/readline/display.c
+++ b/MSVC/readline/display.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/funmap.c b/MSVC/readline/funmap.c
index 36c30bc..09054c0 100644
--- a/MSVC/readline/funmap.c
+++ b/MSVC/readline/funmap.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/histexpand.c b/MSVC/readline/histexpand.c
index dc2a89f..e811376 100644
--- a/MSVC/readline/histexpand.c
+++ b/MSVC/readline/histexpand.c
@@ -20,7 +20,9 @@
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/histfile.c b/MSVC/readline/histfile.c
index b0279db..dc07ba3 100644
--- a/MSVC/readline/histfile.c
+++ b/MSVC/readline/histfile.c
@@ -23,11 +23,16 @@
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions
    you can call.  I think I have done that. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
 #include <stdio.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
 
 #include <sys/types.h>
 #if !defined _MINIX && !defined _WIN32
diff --git a/MSVC/readline/history.c b/MSVC/readline/history.c
index 4f6d6fc..536f056 100644
--- a/MSVC/readline/history.c
+++ b/MSVC/readline/history.c
@@ -23,7 +23,9 @@
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions
    you can call.  I think I have done that. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/histsearch.c b/MSVC/readline/histsearch.c
index 5077e63..5bdcdd9 100644
--- a/MSVC/readline/histsearch.c
+++ b/MSVC/readline/histsearch.c
@@ -20,7 +20,9 @@
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/input.c b/MSVC/readline/input.c
index 1822fdf..a111307 100644
--- a/MSVC/readline/input.c
+++ b/MSVC/readline/input.c
@@ -19,7 +19,10 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
+
 
 #include "config.h"
 
diff --git a/MSVC/readline/isearch.c b/MSVC/readline/isearch.c
index a9d28bd..b00dd28 100644
--- a/MSVC/readline/isearch.c
+++ b/MSVC/readline/isearch.c
@@ -24,7 +24,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/keymaps.c b/MSVC/readline/keymaps.c
index e16f150..917f2f2 100644
--- a/MSVC/readline/keymaps.c
+++ b/MSVC/readline/keymaps.c
@@ -18,7 +18,9 @@
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/kill.c b/MSVC/readline/kill.c
index 4dc3b16..ac62cc0 100644
--- a/MSVC/readline/kill.c
+++ b/MSVC/readline/kill.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/macro.c b/MSVC/readline/macro.c
index 08be5f2..6898caa 100644
--- a/MSVC/readline/macro.c
+++ b/MSVC/readline/macro.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/mbutil.c b/MSVC/readline/mbutil.c
index a955778..413898b 100644
--- a/MSVC/readline/mbutil.c
+++ b/MSVC/readline/mbutil.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/misc.c b/MSVC/readline/misc.c
index d8be28b..b353500 100644
--- a/MSVC/readline/misc.c
+++ b/MSVC/readline/misc.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/nls.c b/MSVC/readline/nls.c
index 27c834a..ba28dca 100644
--- a/MSVC/readline/nls.c
+++ b/MSVC/readline/nls.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
@@ -82,11 +84,9 @@ _rl_init_eightbit ()
 /* If we have setlocale(3), just check the current LC_CTYPE category
    value, and go into eight-bit mode if it's not C or POSIX. */
 #if defined (HAVE_SETLOCALE)
-  char *t;
-
 #ifndef _WIN32
   /* Set the LC_CTYPE locale category from environment variables. */
-  t = setlocale (LC_CTYPE, "");
+  char * t = setlocale (LC_CTYPE, "");
   if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0))
     {
 #endif
diff --git a/MSVC/readline/parens.c b/MSVC/readline/parens.c
index 5b79b31..8cee2b1 100644
--- a/MSVC/readline/parens.c
+++ b/MSVC/readline/parens.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "rlconf.h"
 
diff --git a/MSVC/readline/readline.c b/MSVC/readline/readline.c
index 54fea59..9998e6d 100644
--- a/MSVC/readline/readline.c
+++ b/MSVC/readline/readline.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/rltty.c b/MSVC/readline/rltty.c
index 6996ca9..782670d 100644
--- a/MSVC/readline/rltty.c
+++ b/MSVC/readline/rltty.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/search.c b/MSVC/readline/search.c
index 2f7d4b9..02d5e4d 100644
--- a/MSVC/readline/search.c
+++ b/MSVC/readline/search.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/shell.c b/MSVC/readline/shell.c
index 22ee2ad..4ad15ad 100644
--- a/MSVC/readline/shell.c
+++ b/MSVC/readline/shell.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/signals.c b/MSVC/readline/signals.c
index 75e39c6..648044a 100644
--- a/MSVC/readline/signals.c
+++ b/MSVC/readline/signals.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/terminal.c b/MSVC/readline/terminal.c
index b080a88..5a185bb 100644
--- a/MSVC/readline/terminal.c
+++ b/MSVC/readline/terminal.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/text.c b/MSVC/readline/text.c
index 6272ba7..8c9b1d8 100644
--- a/MSVC/readline/text.c
+++ b/MSVC/readline/text.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/tilde.c b/MSVC/readline/tilde.c
index fdf54b9..d3ddf7e 100644
--- a/MSVC/readline/tilde.c
+++ b/MSVC/readline/tilde.c
@@ -18,7 +18,9 @@
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/undo.c b/MSVC/readline/undo.c
index 07002da..0e98538 100644
--- a/MSVC/readline/undo.c
+++ b/MSVC/readline/undo.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/util.c b/MSVC/readline/util.c
index 37959dd..682dfe3 100644
--- a/MSVC/readline/util.c
+++ b/MSVC/readline/util.c
@@ -19,7 +19,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 #include "config.h"
 
diff --git a/MSVC/readline/vi_mode.c b/MSVC/readline/vi_mode.c
index 6ea2161..4349ec7 100644
--- a/MSVC/readline/vi_mode.c
+++ b/MSVC/readline/vi_mode.c
@@ -20,7 +20,9 @@
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#ifndef READLINE_LIBRARY
 #define READLINE_LIBRARY
+#endif
 
 /* **************************************************************** */
 /*								    */