From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 22 Apr 2015 08:55:26 +0000 (+0200)
Subject: Undef basename before defining function.
X-Git-Tag: newlib-snapshot-20150423~4
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3d96fa70720a2b08c553bde7171bf943cd585d84;p=newlib-cygwin.git

Undef basename before defining function.

        * path.cc (basename): Undefine basename before defining function to
        avoid type collision with prototype in string.h.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 774828faf..589e0c70a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (basename): Undefine basename before defining function to
+	avoid type collision with prototype in string.h.
+
 2015-04-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/libgen.h: Remove in favor of newlib version.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 5439a161a..ea5595698 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -4726,6 +4726,8 @@ out:
   return buf;
 }
 
+#undef basename
+
 /* No need to be reentrant or thread-safe according to SUSv3.
    / and \\ are treated equally.  Leading drive specifiers are
    kept intact as far as it makes sense.  Everything else is