diff options
author | David Sommerseth <davids@redhat.com> | 2012-01-11 15:30:28 +0100 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2012-01-11 15:30:28 +0100 |
commit | edf8bbacd18d063e50c6a7f787f7e413d146af87 (patch) | |
tree | eb3e82d166c1ee328ac5f5c5d4ec3cd911efff67 | |
parent | a4234e1e26693e8fe6a67eea5824ef02d11c825e (diff) | |
download | openvpn-edf8bbacd18d063e50c6a7f787f7e413d146af87.tar.gz openvpn-edf8bbacd18d063e50c6a7f787f7e413d146af87.tar.xz openvpn-edf8bbacd18d063e50c6a7f787f7e413d146af87.zip |
New Windows build fixes
compat.c: In basename() a typo had gone undetected through the review process,
and also that the declaration was a little bit different from what's defined in
compat.h
misc.c: commit 9449e6a9eba30c9ed054f57d630a88c9f087080f adds #include <unistd.h>.
This breaks building on Windows. As unistd.h is already loaded via syshead.h on
systems where unistd.h exists, we don't need it here.
Signed-off-by: David Sommerseth <davids@redhat.com>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
-rw-r--r-- | compat.c | 4 | ||||
-rw-r--r-- | misc.c | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -117,9 +117,9 @@ dirname (char *path) * This version is extended to handle both / and \ in path names */ char * -basename (const char *filename) +basename (char *filename) { - char *p = strrchr (filenamem, '/'); + char *p = strrchr (filename, '/'); if (!p) { /* If NULL, check for \ instead ... might be Windows a path */ p = strrchr (filename, '\\'); @@ -36,7 +36,6 @@ #include "crypto.h" #include "route.h" #include "win32.h" -#include <unistd.h> #include "memdbg.h" |