Improve include order to help Solaris 11 build.

Author: 0-wiz-0

lib/compat.h

@@ -34,18 +34,16 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "zipconf.h"
-
-#include "config.h"
-
-#include <sys/stat.h>
-
 /* to have *_MAX definitions for all types when compiling with g++ */
 #define __STDC_LIMIT_MACROS
 
 /* to have ISO C secure library functions */
 #define __STDC_WANT_LIB_EXT1__ 1
 
+#include "config.h"
+
+#include <sys/stat.h>
+
 #ifdef _WIN32
 #ifndef ZIP_EXTERN
 #ifndef ZIP_STATIC

lib/zip_buffer.c

@@ -31,11 +31,11 @@
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "zipint.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
-
 zip_uint8_t *
 _zip_buffer_data(zip_buffer_t *buffer) {
     return buffer->data;

lib/zip_dir_add.c

@@ -31,12 +31,11 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "zipint.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
-
 
 /* NOTE: Signed due to -1 on error.  See zip_add.c for more details. */
 

lib/zip_dirent.c

@@ -31,6 +31,8 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "zipint.h"
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,8 +41,6 @@
 #include <time.h>
 #include <zlib.h>
 
-#include "zipint.h"
-
 static zip_string_t *_zip_dirent_process_ef_utf_8(const zip_dirent_t *de, zip_uint16_t id, zip_string_t *str, bool check_consistency);
 static zip_extra_field_t *_zip_ef_utf8(zip_uint16_t, zip_string_t *, zip_error_t *);
 static bool _zip_dirent_process_winzip_aes(zip_dirent_t *de, zip_error_t *error);
@@ -1371,4 +1371,4 @@ zip_dirent_get_last_mod_mtime(zip_dirent_t *de) {
     }
 
     return de->last_mod_mtime;
-}
+}

lib/zip_error_strerror.c

@@ -32,13 +32,13 @@
 */
 
 
+#include "zipint.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <zlib.h>
 
-#include "zipint.h"
-
 ZIP_EXTERN const char *
 zip_error_strerror(zip_error_t *err) {
     const char *zip_error_string, *system_error_string;

lib/zip_error_to_str.c

@@ -33,12 +33,12 @@
 
 
 /* LCOV_EXCL_START */
-#include <stdio.h>
-#include <string.h>
-
 #define _ZIP_COMPILING_DEPRECATED
 #include "zipint.h"
 
+#include <stdio.h>
+#include <string.h>
+
 
 ZIP_EXTERN int
 zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) {

lib/zip_io_util.c

@@ -31,13 +31,13 @@
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "zipint.h"
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <zlib.h>
 
-#include "zipint.h"
-
 int
 _zip_read(zip_source_t *src, zip_uint8_t *b, zip_uint64_t length, zip_error_t *error) {
     zip_int64_t n;

lib/zip_memdup.c

@@ -31,11 +31,11 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "zipint.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
-
 
 void *
 _zip_memdup(const void *mem, size_t len, zip_error_t *error) {

lib/zip_source_buffer.c

@@ -31,11 +31,11 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "zipint.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
-
 #ifndef WRITE_FRAGMENT_SIZE
 #define WRITE_FRAGMENT_SIZE (64 * 1024)
 #endif

lib/zip_source_compress.c

@@ -31,11 +31,11 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "zipint.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
-
 struct context {
     zip_error_t error;