Fix clang warnings about inconsistent use of dllexport

[wimlib] / programs / imagex-win32.c

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index 0d87bab37c87b7c835e751b68ad601e78b0caac0..b72ae354f7401ef1124ef65b09be629f9ac99c12 100644 (file)
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -1,6 +1,6 @@
 /* Windows-specific code for wimlib-imagex.  */
 
-#ifndef __WIN32__
+#ifndef _WIN32
 #  error "This file contains Windows code"
 #endif
 
@@ -56,28 +56,6 @@ L"       Maybe try converting your text file to UTF-16LE?\n"
        return NULL;
 }
 
-static inline bool
-is_path_separator(wchar_t c)
-{
-       return c == L'/' || c == L'\\';
-}
-
-/* basename() (modifying, trailing-slash stripping version) for wide-character
- * strings.  Understands both forward and backward slashes.  */
-wchar_t *
-win32_wbasename(wchar_t *path)
-{
-       wchar_t *p = wcschr(path, L'\0');
-
-       p--;
-       while (p >= path && is_path_separator(*p))
-               *p-- = '\0';
-       while (p >= path && !is_path_separator(*p))
-               p--;
-       p++;
-       return p;
-}
-
 /* Set a file descriptor to binary mode.  */
 void set_fd_to_binary_mode(int fd)
 {
@@ -90,7 +68,7 @@ static wchar_t *
 get_security_descriptor_string(PSECURITY_DESCRIPTOR desc)
 {
        wchar_t *str = NULL;
-       /* 53 characters!!!  */
+       /* 52 characters!!!  */
        ConvertSecurityDescriptorToStringSecurityDescriptorW(
                        desc,
                        SDDL_REVISION_1,