diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-04-22 10:55:26 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-22 10:55:26 +0200 |
| commit | 3d96fa70720a2b08c553bde7171bf943cd585d84 (patch) | |
| tree | 7489353fb457a65eb8c97c3a0c6775a0216342ba | |
| parent | 84e4cb880afd04de3693a7b61f53aa91c575b101 (diff) | |
| download | cygnal-3d96fa70720a2b08c553bde7171bf943cd585d84.tar.gz cygnal-3d96fa70720a2b08c553bde7171bf943cd585d84.tar.bz2 cygnal-3d96fa70720a2b08c553bde7171bf943cd585d84.zip | |
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>
| -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 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 |