[PATCH] winsup/cygwin: fix compile of path.cc after basename changes

[PATCH] winsup/cygwin: fix compile of path.cc after basename changes

[Yaakov Selkowitz]

---
 winsup/cygwin/path.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 446d746..5eb076f 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -48,7 +48,7 @@
      c: means c:\.
   */
 
-#define _BASENAME_DEFINED
+#define basename basename
 #include "winsup.h"
 #include "miscfuncs.h"
 #include <ctype.h>
@@ -70,6 +70,7 @@
 #include <ntdll.h>
 #include <wchar.h>
 #include <wctype.h>
+#undef basename
 
 suffix_info stat_suffixes[] =
 {
@@ -4739,8 +4740,6 @@ 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
-- 
2.4.4

Re: [PATCH] winsup/cygwin: fix compile of path.cc after basename changes

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

On Jul  6 14:41, Yaakov Selkowitz wrote:
> ---
>  winsup/cygwin/path.cc | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
> index 446d746..5eb076f 100644
> --- a/winsup/cygwin/path.cc
> +++ b/winsup/cygwin/path.cc
> @@ -48,7 +48,7 @@
>       c: means c:\.
>    */
>  
> -#define _BASENAME_DEFINED
> +#define basename basename

As part of the sources, this define needs an informative comment,
describing why it's necessary.  Ideally not in just three words
following on the same line but in full english preceeding the #define
line.  With such a comment and a ChangeLog entry, patch is ok.


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]