1 files changed, 37 insertions, 22 deletions
diff --git a/src/Common/libzip/compat.h b/src/Common/libzip/compat.h
index dc73f5ce..7604d969 100644
--- a/src/Common/libzip/compat.h
+++ b/src/Common/libzip/compat.h
@@ -5,3 +5,3 @@
   compat.h -- compatibility defines.
-  Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
 
@@ -22,3 +22,3 @@
      written permission.
- 
+
   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
@@ -36,2 +36,4 @@
 
+#include "zipconf.h"
+
 #ifdef HAVE_CONFIG_H
@@ -44,6 +46,8 @@
 #ifdef _WIN32
-#ifdef ZIP_STATIC
-#define ZIP_EXTERN
-#else
+#ifndef ZIP_EXTERN
+#ifndef ZIP_STATIC
 #define ZIP_EXTERN __declspec(dllexport)
+#else
+#define ZIP_EXTERN
+#endif
 #endif
@@ -56,5 +60,7 @@
 #else
+#ifndef __cplusplus
 typedef char bool;
-#define true    1
-#define false   0
+#define true 1
+#define false 0
+#endif
 #endif
@@ -78,7 +84,10 @@ typedef char bool;
 #ifdef _WIN32
+#if defined(HAVE__CHMOD)
+#define chmod _chmod
+#endif
 #if defined(HAVE__CLOSE)
-#define close		_close
+#define close _close
 #endif
 #if defined(HAVE__DUP)
-#define dup		_dup
+#define dup _dup
 #endif
@@ -86,6 +95,6 @@ typedef char bool;
 #if defined(HAVE__FDOPEN)
-#define fdopen		_fdopen
+#define fdopen _fdopen
 #endif
 #if !defined(HAVE_FILENO) && defined(HAVE__FILENO)
-#define fileno		_fileno
+#define fileno _fileno
 #endif
@@ -93,6 +102,6 @@ typedef char bool;
 #if defined(HAVE__OPEN)
-#define open(a, b, c)	_open((a), (b))
+#define open(a, b, c) _open((a), (b))
 #endif
 #if defined(HAVE__SNPRINTF)
-#define snprintf	_snprintf
+#define snprintf _snprintf
 #endif
@@ -101,3 +110,3 @@ typedef char bool;
 #undef strdup
-#define strdup		_strdup
+#define strdup _strdup
 #endif
@@ -105,9 +114,15 @@ typedef char bool;
 #if !defined(HAVE__SETMODE) && defined(HAVE_SETMODE)
-#define _setmode	setmode
+#define _setmode setmode
 #endif
 #if !defined(HAVE_STRTOLL) && defined(HAVE__STRTOI64)
-#define strtoll		_strtoi64
+#define strtoll _strtoi64
 #endif
 #if !defined(HAVE_STRTOULL) && defined(HAVE__STRTOUI64)
-#define strtoull	_strtoui64
+#define strtoull _strtoui64
+#endif
+#if defined(HAVE__UMASK)
+#define umask _umask
+#endif
+#if defined(HAVE__UNLINK)
+#define unlink _unlink
 #endif
@@ -116,3 +131,3 @@ typedef char bool;
 #ifndef HAVE_FSEEKO
-#define fseeko(s, o, w)	(fseek((s), (long int)(o), (w)))
+#define fseeko(s, o, w) (fseek((s), (long int)(o), (w)))
 #endif
@@ -120,3 +135,3 @@ typedef char bool;
 #ifndef HAVE_FTELLO
-#define ftello(s)	((long)ftell((s)))
+#define ftello(s) ((long)ftell((s)))
 #endif
@@ -130,5 +145,5 @@ int _zip_mkstemp(char *);
 #if defined(HAVE__STRICMP)
-#define strcasecmp	_stricmp
+#define strcasecmp _stricmp
 #elif defined(HAVE_STRICMP)
-#define strcasecmp	stricmp
+#define strcasecmp stricmp
 #endif
@@ -187,3 +202,3 @@ int _zip_mkstemp(char *);
 #ifndef S_ISDIR
-#define S_ISDIR(mode)	(((mode) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
 #endif