summaryrefslogtreecommitdiff
path: root/libarchive/archive_windows.h
diff options
context:
space:
mode:
authorNiLuJe <ninuje@gmail.com>2013-12-23 00:04:38 +0100
committerNiLuJe <ninuje@gmail.com>2013-12-23 00:04:38 +0100
commit9d3ddfc96e699429bf99c3f1d39ebd0f220942b4 (patch)
treefd3d6a7015c63c07eb8712f56511ee43fc71d5a7 /libarchive/archive_windows.h
parente0bcfb12ef7c6d3bc2dd142bd0fde0b84dd55f99 (diff)
downloadlibarchive-9d3ddfc96e699429bf99c3f1d39ebd0f220942b4.tar.gz
More MinGW trickery...
Poor man's attempt at making 4e002d9a92ecd7cec0fb98b0bedbace8aad81f6e play nice with MinGW. Dry coded for the fastest solution, there's probably a much better way to handle that sanely & properly.
Diffstat (limited to 'libarchive/archive_windows.h')
-rw-r--r--libarchive/archive_windows.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index c6f5bc51..1ef4fa04 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -89,7 +89,7 @@
/* Alias the Windows _function to the POSIX equivalent. */
#define close _close
-#define fcntl(fd, cmd, flg) /* No operation. */
+#define fcntl(fd, cmd, flg) /* No operation. */
#ifndef fileno
#define fileno _fileno
#endif
@@ -203,7 +203,7 @@
#define _S_IXGRP (_S_IXUSR >> 3) /* read permission, group */
#define _S_IWGRP (_S_IWUSR >> 3) /* write permission, group */
#define _S_IRGRP (_S_IRUSR >> 3) /* execute/search permission, group */
-#define _S_IRWXO (_S_IRWXG >> 3)
+#define _S_IRWXO (_S_IRWXG >> 3)
#define _S_IXOTH (_S_IXGRP >> 3) /* read permission, other */
#define _S_IWOTH (_S_IWGRP >> 3) /* write permission, other */
#define _S_IROTH (_S_IRGRP >> 3) /* execute/search permission, other */
@@ -277,6 +277,8 @@ extern wchar_t *__la_win_permissive_name(const char *name);
extern wchar_t *__la_win_permissive_name_w(const wchar_t *wname);
extern void __la_dosmaperr(unsigned long e);
#define la_dosmaperr(e) __la_dosmaperr(e)
+extern char *__la_strsep(char **sp, char *sep);
+#define strsep(sp, sep) __la_strsep(sp, sep)
extern struct archive_entry *__la_win_entry_in_posix_pathseparator(
struct archive_entry *);