Order the Code

Sources/libetk/etk/File.cpp

@@ -32,7 +32,7 @@
 #	include <GeneratedData.h>
 #elif defined(DATA_IN_APK)
 #	include <stdio.h>
-#	include <zip.h>
+#	include <zip/zip.h>
 #endif
 
 

Sources/libpng/Android.mk

@@ -16,25 +16,16 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := 
-
 LOCAL_MODULE    := libpng
-LOCAL_SRC_FILES :=\
+
-	png.c \
+LOCAL_CFLAGS := -DPNG_NO_LIMITS_H
-	pngerror.c \
+
-	pngget.c \
+LOCAL_C_INCLUDES := -I$(LOCAL_PATH)
-	pngmem.c \
+
-	pngpread.c \
+# load the common sources file of the platform
-	pngread.c \
+include $(LOCAL_PATH)/file.mk
-	pngrio.c \
+
-	pngrtran.c \
+LOCAL_SRC_FILES := $(FILE_LIST)
-	pngrutil.c \
-	pngset.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c 
 
 LOCAL_LDLIBS := -lz
 

Sources/libpng/Linux.mk

@@ -16,25 +16,16 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := 
+LOCAL_CFLAGS := -DPNG_NO_LIMITS_H
 
 LOCAL_MODULE    := libpng
-LOCAL_SRC_FILES :=\
+
-	png.c \
+LOCAL_C_INCLUDES := -I$(LOCAL_PATH)
-	pngerror.c \
+
-	pngget.c \
+# load the common sources file of the platform
-	pngmem.c \
+include $(LOCAL_PATH)/file.mk
-	pngpread.c \
+
-	pngread.c \
+LOCAL_SRC_FILES := $(FILE_LIST)
-	pngrio.c \
-	pngrtran.c \
-	pngrutil.c \
-	pngset.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c 
 
 LOCAL_LDLIBS := -lz
 

Sources/libpng/file.mk

@@ -0,0 +1,20 @@
+
+FILE_LIST = png/png.c \
+			png/error.c \
+			png/get.c \
+			png/mem.c \
+			png/pread.c \
+			png/read.c \
+			png/rio.c \
+			png/rtran.c \
+			png/rutil.c \
+			png/set.c \
+			png/trans.c \
+			png/wio.c \
+			png/write.c \
+			png/wtran.c \
+			png/wutil.c
+
+
+
+

Sources/libpng/png/conf.h

@@ -21,11 +21,11 @@
 
 #ifndef PNGCONF_H
 #define PNGCONF_H
-
+/*
 #ifndef PNG_NO_LIMITS_H
-#  include <limits.h>
+#  include <png/limits.h>
 #endif
-
+*/
 /* Added at libpng-1.2.9 */
 
 /* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
@@ -33,7 +33,7 @@
  */
 #ifdef PNG_CONFIGURE_LIBPNG
 #  ifdef HAVE_CONFIG_H
-#    include "config.h"
+#    include "png/config.h"
 #  endif
 #endif
 
@@ -47,7 +47,7 @@
 #  ifndef PNG_USER_PRIVATEBUILD
 #    define PNG_USER_PRIVATEBUILD
 #  endif
-#  include "pngusr.h"
+#  include "png/usr.h"
 #endif
 
 /*

Sources/libpng/png/error.c

@@ -17,9 +17,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#include "pngpriv.h"
+#include "png/priv.h"
 
 static void /* PRIVATE */
 png_default_error PNGARG((png_structp png_ptr,

Sources/libpng/png/get.c

@@ -13,9 +13,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#include "pngpriv.h"
+#include "png/priv.h"
 
 png_uint_32 PNGAPI
 png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)

Sources/libpng/png/mem.c

@@ -18,9 +18,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Borland DOS special memory handler */
 #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)

Sources/libpng/png/png.c

@@ -13,8 +13,8 @@
 
 #define PNG_NO_EXTERN
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
 typedef version_1_4_1 Your_png_h_is_not_version_1_4_1;

Sources/libpng/png/png.h

@@ -392,7 +392,7 @@
 #endif
 
 /* Include all user configurable info, including optional assembler routines */
-#include "pngconf.h"
+#include "png/conf.h"
 
 /*
  * Added at libpng-1.2.8

Sources/libpng/png/pread.c

@@ -12,9 +12,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Push model modes */
 #define PNG_READ_SIG_MODE   0

Sources/libpng/png/read.c

@@ -15,9 +15,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_READ_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 
 /* Create a PNG structure for reading, and allocate any memory needed. */

Sources/libpng/png/rio.c

@@ -19,9 +19,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_READ_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Read the data from whatever input you are using.  The default routine
  * reads from a file pointer.  Note that this routine sometimes gets called

Sources/libpng/png/rtran.c

@@ -17,9 +17,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_READ_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Set the action on getting a CRC error for an ancillary or critical chunk. */
 void PNGAPI

Sources/libpng/png/rutil.c

@@ -15,9 +15,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_READ_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 #    define png_strtod(p,a,b) strtod(a,b)
 png_uint_32 PNGAPI

Sources/libpng/png/set.c

@@ -17,9 +17,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#include "pngpriv.h"
+#include "png/priv.h"
 
 #ifdef PNG_bKGD_SUPPORTED
 void PNGAPI

Sources/libpng/png/trans.c

@@ -12,9 +12,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#include "pngpriv.h"
+#include "png/priv.h"
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* Turn on BGR-to-RGB mapping */

Sources/libpng/png/wio.c

@@ -19,9 +19,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_WRITE_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Write the data to whatever output you are using.  The default routine
  * writes to a file pointer.  Note that this routine sometimes gets called

Sources/libpng/png/write.c

@@ -13,9 +13,9 @@
 
 /* Get internal access to png.h */
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_WRITE_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Writes all the PNG information.  This is the suggested way to use the
  * library.  If you have a new chunk to add, make a function to write it,

Sources/libpng/png/wtran.c

@@ -12,9 +12,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_WRITE_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Transform the data according to the user's wishes.  The order of
  * transformations is significant.

Sources/libpng/png/wutil.c

@@ -12,9 +12,9 @@
  */
 
 #define PNG_NO_PEDANTIC_WARNINGS
-#include "png.h"
+#include "png/png.h"
 #ifdef PNG_WRITE_SUPPORTED
-#include "pngpriv.h"
+#include "png/priv.h"
 
 /* Place a 32-bit number into a buffer in PNG byte order.  We work
  * with unsigned numbers for convenience, although one supported

Sources/libzip/Android.mk

@@ -17,60 +17,13 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := libzip
-LOCAL_SRC_FILES :=\
+
-	zip_add.c \
+LOCAL_C_INCLUDES := -I$(LOCAL_PATH)
-	zip_add_dir.c \
+
-	zip_close.c \
+# load the common sources file of the platform
-	zip_delete.c \
+include $(LOCAL_PATH)/file.mk
-	zip_dirent.c \
+
-	zip_entry_free.c \
+LOCAL_SRC_FILES := $(FILE_LIST)
-	zip_entry_new.c \
-	zip_err_str.c \
-	zip_error.c \
-	zip_error_clear.c \
-	zip_error_get.c \
-	zip_error_get_sys_type.c \
-	zip_error_strerror.c \
-	zip_error_to_str.c \
-	zip_fclose.c \
-	zip_file_error_clear.c \
-	zip_file_error_get.c \
-	zip_file_get_offset.c \
-	zip_file_strerror.c \
-	zip_filerange_crc.c \
-	zip_fopen.c \
-	zip_fopen_index.c \
-	zip_fread.c \
-	zip_free.c \
-	zip_get_archive_comment.c \
-	zip_get_archive_flag.c \
-	zip_get_file_comment.c \
-	zip_get_num_files.c \
-	zip_get_name.c \
-	zip_memdup.c \
-	zip_name_locate.c \
-	zip_new.c \
-	zip_open.c \
-	zip_rename.c \
-	zip_replace.c \
-	zip_set_archive_comment.c \
-	zip_set_archive_flag.c \
-	zip_set_file_comment.c \
-	zip_source_buffer.c \
-	zip_source_file.c \
-	zip_source_filep.c \
-	zip_source_free.c \
-	zip_source_function.c \
-	zip_source_zip.c \
-	zip_set_name.c \
-	zip_stat.c \
-	zip_stat_index.c \
-	zip_stat_init.c \
-	zip_strerror.c \
-	zip_unchange.c \
-	zip_unchange_all.c \
-	zip_unchange_archive.c \
-	zip_unchange_data.c
 
 LOCAL_LDLIBS := -lz
 

Sources/libzip/Linux.mk

@@ -17,60 +17,13 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := libzip
-LOCAL_SRC_FILES :=\
+
-	zip_add.c \
+LOCAL_C_INCLUDES := -I$(LOCAL_PATH)
-	zip_add_dir.c \
+
-	zip_close.c \
+# load the common sources file of the platform
-	zip_delete.c \
+include $(LOCAL_PATH)/file.mk
-	zip_dirent.c \
+
-	zip_entry_free.c \
+LOCAL_SRC_FILES := $(FILE_LIST)
-	zip_entry_new.c \
-	zip_err_str.c \
-	zip_error.c \
-	zip_error_clear.c \
-	zip_error_get.c \
-	zip_error_get_sys_type.c \
-	zip_error_strerror.c \
-	zip_error_to_str.c \
-	zip_fclose.c \
-	zip_file_error_clear.c \
-	zip_file_error_get.c \
-	zip_file_get_offset.c \
-	zip_file_strerror.c \
-	zip_filerange_crc.c \
-	zip_fopen.c \
-	zip_fopen_index.c \
-	zip_fread.c \
-	zip_free.c \
-	zip_get_archive_comment.c \
-	zip_get_archive_flag.c \
-	zip_get_file_comment.c \
-	zip_get_num_files.c \
-	zip_get_name.c \
-	zip_memdup.c \
-	zip_name_locate.c \
-	zip_new.c \
-	zip_open.c \
-	zip_rename.c \
-	zip_replace.c \
-	zip_set_archive_comment.c \
-	zip_set_archive_flag.c \
-	zip_set_file_comment.c \
-	zip_source_buffer.c \
-	zip_source_file.c \
-	zip_source_filep.c \
-	zip_source_free.c \
-	zip_source_function.c \
-	zip_source_zip.c \
-	zip_set_name.c \
-	zip_stat.c \
-	zip_stat_index.c \
-	zip_stat_init.c \
-	zip_strerror.c \
-	zip_unchange.c \
-	zip_unchange_all.c \
-	zip_unchange_archive.c \
-	zip_unchange_data.c
 
 LOCAL_LDLIBS := -lz
 

Sources/libzip/file.mk

@@ -0,0 +1,55 @@
+
+
+FILE_LIST = zip/add.c \
+			zip/add_dir.c \
+			zip/close.c \
+			zip/delete.c \
+			zip/dirent.c \
+			zip/entry_free.c \
+			zip/entry_new.c \
+			zip/err_str.c \
+			zip/error.c \
+			zip/error_clear.c \
+			zip/error_get.c \
+			zip/error_get_sys_type.c \
+			zip/error_strerror.c \
+			zip/error_to_str.c \
+			zip/fclose.c \
+			zip/file_error_clear.c \
+			zip/file_error_get.c \
+			zip/file_get_offset.c \
+			zip/file_strerror.c \
+			zip/filerange_crc.c \
+			zip/fopen.c \
+			zip/fopen_index.c \
+			zip/fread.c \
+			zip/free.c \
+			zip/get_archive_comment.c \
+			zip/get_archive_flag.c \
+			zip/get_file_comment.c \
+			zip/get_num_files.c \
+			zip/get_name.c \
+			zip/memdup.c \
+			zip/name_locate.c \
+			zip/new.c \
+			zip/open.c \
+			zip/rename.c \
+			zip/replace.c \
+			zip/set_archive_comment.c \
+			zip/set_archive_flag.c \
+			zip/set_file_comment.c \
+			zip/source_buffer.c \
+			zip/source_file.c \
+			zip/source_filep.c \
+			zip/source_free.c \
+			zip/source_function.c \
+			zip/source_zip.c \
+			zip/set_name.c \
+			zip/stat.c \
+			zip/stat_index.c \
+			zip/stat_init.c \
+			zip/strerror.c \
+			zip/unchange.c \
+			zip/unchange_all.c \
+			zip/unchange_archive.c \
+			zip/unchange_data.c

Sources/libzip/zip/add.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/add_dir.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/close.c

@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 static int add_data(struct zip *, struct zip_source *, struct zip_dirent *,
 		    FILE *);

Sources/libzip/zip/delete.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/dirent.c

@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 static time_t _zip_d2u_time(int, int);
 static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *);

Sources/libzip/zip/entry_free.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/entry_new.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/err_str.c

@@ -3,7 +3,7 @@
    from ./zip.h; make changes there.
  */
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error_clear.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error_get.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error_get_sys_type.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error_strerror.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/error_to_str.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/fclose.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/file_error_clear.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/file_error_get.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/file_get_offset.c

@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/file_strerror.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/filerange_crc.c

@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/fopen.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/fopen_index.c

@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 static struct zip_file *_zip_file_new(struct zip *za);
 

Sources/libzip/zip/fread.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/free.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/get_archive_comment.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/get_archive_flag.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/get_file_comment.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/get_name.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/get_num_files.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/int.h

@@ -40,8 +40,8 @@
 #define ZIP_EXTERN __declspec(dllimport)
 #endif
 
-#include "zip.h"
+#include "zip/zip.h"
-#include "config.h"
+#include "zip/config.h"
 
 #ifndef HAVE_MKSTEMP
 int _zip_mkstemp(char *);

Sources/libzip/zip/memdup.c

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/name_locate.c

@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/new.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/open.c

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 static void set_error(int *, struct zip_error *, int);
 static struct zip *_zip_allocate_new(const char *, int *);

Sources/libzip/zip/rename.c

@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/replace.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/set_archive_comment.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/set_archive_flag.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/set_file_comment.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/set_name.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/source_buffer.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 struct read_data {
     const char *buf, *data, *end;

Sources/libzip/zip/source_file.c

@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/source_filep.c

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 struct read_file {
     char *fname;	/* name of file to copy from */

Sources/libzip/zip/source_free.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/source_function.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/source_zip.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 struct read_zip {
     struct zip_file *zf;

Sources/libzip/zip/stat.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/stat_index.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/stat_init.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/strerror.c

@@ -33,7 +33,7 @@
 
 
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/unchange.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/unchange_all.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/unchange_archive.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 
 

Sources/libzip/zip/unchange_data.c

@@ -37,7 +37,7 @@
 
 #include <stdlib.h>
 
-#include "zipint.h"
+#include "zip/int.h"
 
 void
 _zip_unchange_data(struct zip_entry *ze)