From d646c540b7320576a09ea2185c43f5a182d2c69a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Nov 2010 22:16:53 +0000
Subject: * missing/langinfo.c (strncasecmp): get rid of redefinition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 4 ++++
 missing/langinfo.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1de90f6924..d7e020d5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 18 07:16:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/langinfo.c (strncasecmp): get rid of redefinition.
+
 Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/csv.rb: Upgrading output encoding with ASCII content 
diff --git a/missing/langinfo.c b/missing/langinfo.c
index 04633c1b90..594fe1fcf1 100644
--- a/missing/langinfo.c
+++ b/missing/langinfo.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #if defined _WIN32 || defined __CYGWIN__
 #include <windows.h>
-#if defined _WIN32
+#if defined _WIN32 && !defined strncasecmp
 #define strncasecmp strnicmp
 #endif
 #endif
-- 
cgit v1.2.3