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 774828faf55cb810fdceae669e04fd0776e89b28..589e0c70a4a292e2b390e966dcae7a6c4ffcbd80 100644 (file)
--- 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 5439a161a1f355d4e06232ede829cd959a9a3089..ea5595698e701abf3d92f91a9fc28fc046eb770b 100644 (file)
--- 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