diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-04-22 11:55:26 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-23 23:03:45 +0300 |
| commit | 6d099d5bae856af2b92ab3f7812632f0ea8ae7ea (patch) | |
| tree | 8d0c7b64dc987e6861791dbbcc0ad7ba7484bd14 /winsup/cygwin | |
| parent | 97a5dda2b08b515dd2423ee74fc4ed57e85ac4b9 (diff) | |
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>
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a190c2449..eb79fcc07 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 b05333fd7..1dd96cf10 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -4727,6 +4727,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 |