From b180bd648fae28419cc940d0ac4f06bd7da61f05 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Wed, 21 Dec 2011 11:32:48 +0100 Subject: [PATCH] Order the Code --- Sources/libetk/etk/File.cpp | 2 +- Sources/libpng/Android.mk | 29 +++------ Sources/libpng/Linux.mk | 27 +++----- Sources/libpng/file.mk | 20 ++++++ Sources/libpng/{pngconf.h => png/conf.h} | 10 +-- Sources/libpng/{ => png}/config.h | 0 Sources/libpng/{pngerror.c => png/error.c} | 4 +- Sources/libpng/{pngget.c => png/get.c} | 4 +- Sources/libpng/{pngmem.c => png/mem.c} | 4 +- Sources/libpng/{ => png}/png.c | 4 +- Sources/libpng/{ => png}/png.h | 2 +- Sources/libpng/{pngpread.c => png/pread.c} | 4 +- Sources/libpng/{pngpriv.h => png/priv.h} | 0 Sources/libpng/{pngread.c => png/read.c} | 4 +- Sources/libpng/{pngrio.c => png/rio.c} | 4 +- Sources/libpng/{pngrtran.c => png/rtran.c} | 4 +- Sources/libpng/{pngrutil.c => png/rutil.c} | 4 +- Sources/libpng/{pngset.c => png/set.c} | 4 +- Sources/libpng/{pngtrans.c => png/trans.c} | 4 +- Sources/libpng/{pngwio.c => png/wio.c} | 4 +- Sources/libpng/{pngwrite.c => png/write.c} | 4 +- Sources/libpng/{pngwtran.c => png/wtran.c} | 4 +- Sources/libpng/{pngwutil.c => png/wutil.c} | 4 +- Sources/libzip/Android.mk | 61 +++---------------- Sources/libzip/Linux.mk | 61 +++---------------- Sources/libzip/file.mk | 55 +++++++++++++++++ Sources/libzip/{zip_add.c => zip/add.c} | 2 +- .../libzip/{zip_add_dir.c => zip/add_dir.c} | 2 +- Sources/libzip/{zip_close.c => zip/close.c} | 2 +- Sources/libzip/{ => zip}/config.h | 0 Sources/libzip/{zip_delete.c => zip/delete.c} | 2 +- Sources/libzip/{zip_dirent.c => zip/dirent.c} | 2 +- .../{zip_entry_free.c => zip/entry_free.c} | 2 +- .../{zip_entry_new.c => zip/entry_new.c} | 2 +- .../libzip/{zip_err_str.c => zip/err_str.c} | 2 +- Sources/libzip/{zip_error.c => zip/error.c} | 2 +- .../{zip_error_clear.c => zip/error_clear.c} | 2 +- .../{zip_error_get.c => zip/error_get.c} | 2 +- .../error_get_sys_type.c} | 2 +- .../error_strerror.c} | 2 +- .../error_to_str.c} | 2 +- Sources/libzip/{zip_fclose.c => zip/fclose.c} | 2 +- .../file_error_clear.c} | 2 +- .../file_error_get.c} | 2 +- .../file_get_offset.c} | 2 +- .../file_strerror.c} | 2 +- .../filerange_crc.c} | 2 +- Sources/libzip/{zip_fopen.c => zip/fopen.c} | 2 +- .../{zip_fopen_index.c => zip/fopen_index.c} | 2 +- Sources/libzip/{zip_fread.c => zip/fread.c} | 2 +- Sources/libzip/{zip_free.c => zip/free.c} | 2 +- .../get_archive_comment.c} | 2 +- .../get_archive_flag.c} | 2 +- .../get_file_comment.c} | 2 +- .../libzip/{zip_get_name.c => zip/get_name.c} | 2 +- .../get_num_files.c} | 2 +- Sources/libzip/{zipint.h => zip/int.h} | 4 +- Sources/libzip/{zip_memdup.c => zip/memdup.c} | 2 +- Sources/libzip/{ => zip}/mkstemp.c | 0 .../{zip_name_locate.c => zip/name_locate.c} | 2 +- Sources/libzip/{zip_new.c => zip/new.c} | 2 +- Sources/libzip/{zip_open.c => zip/open.c} | 2 +- Sources/libzip/{zip_rename.c => zip/rename.c} | 2 +- .../libzip/{zip_replace.c => zip/replace.c} | 2 +- .../set_archive_comment.c} | 2 +- .../set_archive_flag.c} | 2 +- .../set_file_comment.c} | 2 +- .../libzip/{zip_set_name.c => zip/set_name.c} | 2 +- .../source_buffer.c} | 2 +- .../{zip_source_file.c => zip/source_file.c} | 2 +- .../source_filep.c} | 2 +- .../{zip_source_free.c => zip/source_free.c} | 2 +- .../source_function.c} | 2 +- .../{zip_source_zip.c => zip/source_zip.c} | 2 +- Sources/libzip/{zip_stat.c => zip/stat.c} | 2 +- .../{zip_stat_index.c => zip/stat_index.c} | 2 +- .../{zip_stat_init.c => zip/stat_init.c} | 2 +- .../libzip/{zip_strerror.c => zip/strerror.c} | 2 +- .../libzip/{zip_unchange.c => zip/unchange.c} | 2 +- .../unchange_all.c} | 2 +- .../unchange_archive.c} | 2 +- .../unchange_data.c} | 2 +- Sources/libzip/{ => zip}/zip.h | 0 83 files changed, 200 insertions(+), 237 deletions(-) create mode 100644 Sources/libpng/file.mk rename Sources/libpng/{pngconf.h => png/conf.h} (99%) rename Sources/libpng/{ => png}/config.h (100%) rename Sources/libpng/{pngerror.c => png/error.c} (99%) rename Sources/libpng/{pngget.c => png/get.c} (99%) rename Sources/libpng/{pngmem.c => png/mem.c} (99%) rename Sources/libpng/{ => png}/png.c (99%) rename Sources/libpng/{ => png}/png.h (99%) rename Sources/libpng/{pngpread.c => png/pread.c} (99%) rename Sources/libpng/{pngpriv.h => png/priv.h} (100%) rename Sources/libpng/{pngread.c => png/read.c} (99%) rename Sources/libpng/{pngrio.c => png/rio.c} (99%) rename Sources/libpng/{pngrtran.c => png/rtran.c} (99%) rename Sources/libpng/{pngrutil.c => png/rutil.c} (99%) rename Sources/libpng/{pngset.c => png/set.c} (99%) rename Sources/libpng/{pngtrans.c => png/trans.c} (99%) rename Sources/libpng/{pngwio.c => png/wio.c} (99%) rename Sources/libpng/{pngwrite.c => png/write.c} (99%) rename Sources/libpng/{pngwtran.c => png/wtran.c} (99%) rename Sources/libpng/{pngwutil.c => png/wutil.c} (99%) create mode 100644 Sources/libzip/file.mk rename Sources/libzip/{zip_add.c => zip/add.c} (98%) rename Sources/libzip/{zip_add_dir.c => zip/add_dir.c} (99%) rename Sources/libzip/{zip_close.c => zip/close.c} (99%) rename Sources/libzip/{ => zip}/config.h (100%) rename Sources/libzip/{zip_delete.c => zip/delete.c} (98%) rename Sources/libzip/{zip_dirent.c => zip/dirent.c} (99%) rename Sources/libzip/{zip_entry_free.c => zip/entry_free.c} (98%) rename Sources/libzip/{zip_entry_new.c => zip/entry_new.c} (99%) rename Sources/libzip/{zip_err_str.c => zip/err_str.c} (98%) rename Sources/libzip/{zip_error.c => zip/error.c} (99%) rename Sources/libzip/{zip_error_clear.c => zip/error_clear.c} (98%) rename Sources/libzip/{zip_error_get.c => zip/error_get.c} (98%) rename Sources/libzip/{zip_error_get_sys_type.c => zip/error_get_sys_type.c} (98%) rename Sources/libzip/{zip_error_strerror.c => zip/error_strerror.c} (99%) rename Sources/libzip/{zip_error_to_str.c => zip/error_to_str.c} (99%) rename Sources/libzip/{zip_fclose.c => zip/fclose.c} (99%) rename Sources/libzip/{zip_file_error_clear.c => zip/file_error_clear.c} (98%) rename Sources/libzip/{zip_file_error_get.c => zip/file_error_get.c} (98%) rename Sources/libzip/{zip_file_get_offset.c => zip/file_get_offset.c} (99%) rename Sources/libzip/{zip_file_strerror.c => zip/file_strerror.c} (98%) rename Sources/libzip/{zip_filerange_crc.c => zip/filerange_crc.c} (99%) rename Sources/libzip/{zip_fopen.c => zip/fopen.c} (98%) rename Sources/libzip/{zip_fopen_index.c => zip/fopen_index.c} (99%) rename Sources/libzip/{zip_fread.c => zip/fread.c} (99%) rename Sources/libzip/{zip_free.c => zip/free.c} (99%) rename Sources/libzip/{zip_get_archive_comment.c => zip/get_archive_comment.c} (98%) rename Sources/libzip/{zip_get_archive_flag.c => zip/get_archive_flag.c} (98%) rename Sources/libzip/{zip_get_file_comment.c => zip/get_file_comment.c} (99%) rename Sources/libzip/{zip_get_name.c => zip/get_name.c} (99%) rename Sources/libzip/{zip_get_num_files.c => zip/get_num_files.c} (98%) rename Sources/libzip/{zipint.h => zip/int.h} (99%) rename Sources/libzip/{zip_memdup.c => zip/memdup.c} (98%) rename Sources/libzip/{ => zip}/mkstemp.c (100%) rename Sources/libzip/{zip_name_locate.c => zip/name_locate.c} (99%) rename Sources/libzip/{zip_new.c => zip/new.c} (99%) rename Sources/libzip/{zip_open.c => zip/open.c} (99%) rename Sources/libzip/{zip_rename.c => zip/rename.c} (99%) rename Sources/libzip/{zip_replace.c => zip/replace.c} (99%) rename Sources/libzip/{zip_set_archive_comment.c => zip/set_archive_comment.c} (99%) rename Sources/libzip/{zip_set_archive_flag.c => zip/set_archive_flag.c} (98%) rename Sources/libzip/{zip_set_file_comment.c => zip/set_file_comment.c} (99%) rename Sources/libzip/{zip_set_name.c => zip/set_name.c} (99%) rename Sources/libzip/{zip_source_buffer.c => zip/source_buffer.c} (99%) rename Sources/libzip/{zip_source_file.c => zip/source_file.c} (98%) rename Sources/libzip/{zip_source_filep.c => zip/source_filep.c} (99%) rename Sources/libzip/{zip_source_free.c => zip/source_free.c} (98%) rename Sources/libzip/{zip_source_function.c => zip/source_function.c} (98%) rename Sources/libzip/{zip_source_zip.c => zip/source_zip.c} (99%) rename Sources/libzip/{zip_stat.c => zip/stat.c} (98%) rename Sources/libzip/{zip_stat_index.c => zip/stat_index.c} (99%) rename Sources/libzip/{zip_stat_init.c => zip/stat_init.c} (98%) rename Sources/libzip/{zip_strerror.c => zip/strerror.c} (98%) rename Sources/libzip/{zip_unchange.c => zip/unchange.c} (99%) rename Sources/libzip/{zip_unchange_all.c => zip/unchange_all.c} (98%) rename Sources/libzip/{zip_unchange_archive.c => zip/unchange_archive.c} (98%) rename Sources/libzip/{zip_unchange_data.c => zip/unchange_data.c} (98%) rename Sources/libzip/{ => zip}/zip.h (100%) diff --git a/Sources/libetk/etk/File.cpp b/Sources/libetk/etk/File.cpp index c5af7b8e..e7ee5a08 100644 --- a/Sources/libetk/etk/File.cpp +++ b/Sources/libetk/etk/File.cpp @@ -32,7 +32,7 @@ # include #elif defined(DATA_IN_APK) # include -# include +# include #endif diff --git a/Sources/libpng/Android.mk b/Sources/libpng/Android.mk index 2e7c3f91..b9fe688b 100644 --- a/Sources/libpng/Android.mk +++ b/Sources/libpng/Android.mk @@ -16,26 +16,17 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS := - LOCAL_MODULE := libpng -LOCAL_SRC_FILES :=\ - png.c \ - pngerror.c \ - pngget.c \ - pngmem.c \ - pngpread.c \ - pngread.c \ - pngrio.c \ - pngrtran.c \ - pngrutil.c \ - pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c - + +LOCAL_CFLAGS := -DPNG_NO_LIMITS_H + +LOCAL_C_INCLUDES := -I$(LOCAL_PATH) + +# load the common sources file of the platform +include $(LOCAL_PATH)/file.mk + +LOCAL_SRC_FILES := $(FILE_LIST) + LOCAL_LDLIBS := -lz #include $(BUILD_SHARED_LIBRARY) diff --git a/Sources/libpng/Linux.mk b/Sources/libpng/Linux.mk index 2e7c3f91..23f1559f 100644 --- a/Sources/libpng/Linux.mk +++ b/Sources/libpng/Linux.mk @@ -16,26 +16,17 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS := +LOCAL_CFLAGS := -DPNG_NO_LIMITS_H LOCAL_MODULE := libpng -LOCAL_SRC_FILES :=\ - png.c \ - pngerror.c \ - pngget.c \ - pngmem.c \ - pngpread.c \ - pngread.c \ - pngrio.c \ - pngrtran.c \ - pngrutil.c \ - pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c - + +LOCAL_C_INCLUDES := -I$(LOCAL_PATH) + +# load the common sources file of the platform +include $(LOCAL_PATH)/file.mk + +LOCAL_SRC_FILES := $(FILE_LIST) + LOCAL_LDLIBS := -lz #include $(BUILD_SHARED_LIBRARY) diff --git a/Sources/libpng/file.mk b/Sources/libpng/file.mk new file mode 100644 index 00000000..2864ae17 --- /dev/null +++ b/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 + + + + diff --git a/Sources/libpng/pngconf.h b/Sources/libpng/png/conf.h similarity index 99% rename from Sources/libpng/pngconf.h rename to Sources/libpng/png/conf.h index 4aacf9c7..3c852bd5 100644 --- a/Sources/libpng/pngconf.h +++ b/Sources/libpng/png/conf.h @@ -21,11 +21,11 @@ #ifndef PNGCONF_H #define PNGCONF_H - +/* #ifndef PNG_NO_LIMITS_H -# include +# include #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 /* diff --git a/Sources/libpng/config.h b/Sources/libpng/png/config.h similarity index 100% rename from Sources/libpng/config.h rename to Sources/libpng/png/config.h diff --git a/Sources/libpng/pngerror.c b/Sources/libpng/png/error.c similarity index 99% rename from Sources/libpng/pngerror.c rename to Sources/libpng/png/error.c index 633eae29..c13f9565 100644 --- a/Sources/libpng/pngerror.c +++ b/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, diff --git a/Sources/libpng/pngget.c b/Sources/libpng/png/get.c similarity index 99% rename from Sources/libpng/pngget.c rename to Sources/libpng/png/get.c index ea36f25b..ec05b2a2 100644 --- a/Sources/libpng/pngget.c +++ b/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) diff --git a/Sources/libpng/pngmem.c b/Sources/libpng/png/mem.c similarity index 99% rename from Sources/libpng/pngmem.c rename to Sources/libpng/png/mem.c index 279ba633..e821a34a 100644 --- a/Sources/libpng/pngmem.c +++ b/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__) diff --git a/Sources/libpng/png.c b/Sources/libpng/png/png.c similarity index 99% rename from Sources/libpng/png.c rename to Sources/libpng/png/png.c index 83b4ca2e..98f813ca 100644 --- a/Sources/libpng/png.c +++ b/Sources/libpng/png/png.c @@ -13,8 +13,8 @@ #define PNG_NO_EXTERN #define PNG_NO_PEDANTIC_WARNINGS -#include "png.h" -#include "pngpriv.h" +#include "png/png.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; diff --git a/Sources/libpng/png.h b/Sources/libpng/png/png.h similarity index 99% rename from Sources/libpng/png.h rename to Sources/libpng/png/png.h index c48dcdb9..bd483f98 100644 --- a/Sources/libpng/png.h +++ b/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 diff --git a/Sources/libpng/pngpread.c b/Sources/libpng/png/pread.c similarity index 99% rename from Sources/libpng/pngpread.c rename to Sources/libpng/png/pread.c index bc0df909..045f7d88 100644 --- a/Sources/libpng/pngpread.c +++ b/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 diff --git a/Sources/libpng/pngpriv.h b/Sources/libpng/png/priv.h similarity index 100% rename from Sources/libpng/pngpriv.h rename to Sources/libpng/png/priv.h diff --git a/Sources/libpng/pngread.c b/Sources/libpng/png/read.c similarity index 99% rename from Sources/libpng/pngread.c rename to Sources/libpng/png/read.c index 97803f2c..fc10ad22 100644 --- a/Sources/libpng/pngread.c +++ b/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. */ diff --git a/Sources/libpng/pngrio.c b/Sources/libpng/png/rio.c similarity index 99% rename from Sources/libpng/pngrio.c rename to Sources/libpng/png/rio.c index 59059caf..4e142e41 100644 --- a/Sources/libpng/pngrio.c +++ b/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 diff --git a/Sources/libpng/pngrtran.c b/Sources/libpng/png/rtran.c similarity index 99% rename from Sources/libpng/pngrtran.c rename to Sources/libpng/png/rtran.c index c7e52151..d890e03b 100644 --- a/Sources/libpng/pngrtran.c +++ b/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 diff --git a/Sources/libpng/pngrutil.c b/Sources/libpng/png/rutil.c similarity index 99% rename from Sources/libpng/pngrutil.c rename to Sources/libpng/png/rutil.c index 47b0eea2..13f4707d 100644 --- a/Sources/libpng/pngrutil.c +++ b/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 diff --git a/Sources/libpng/pngset.c b/Sources/libpng/png/set.c similarity index 99% rename from Sources/libpng/pngset.c rename to Sources/libpng/png/set.c index 1f972c4e..dc467014 100644 --- a/Sources/libpng/pngset.c +++ b/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 diff --git a/Sources/libpng/pngtrans.c b/Sources/libpng/png/trans.c similarity index 99% rename from Sources/libpng/pngtrans.c rename to Sources/libpng/png/trans.c index 7b217bb3..643ef897 100644 --- a/Sources/libpng/pngtrans.c +++ b/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 */ diff --git a/Sources/libpng/pngwio.c b/Sources/libpng/png/wio.c similarity index 99% rename from Sources/libpng/pngwio.c rename to Sources/libpng/png/wio.c index f4d995b1..a2f3b6c0 100644 --- a/Sources/libpng/pngwio.c +++ b/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 diff --git a/Sources/libpng/pngwrite.c b/Sources/libpng/png/write.c similarity index 99% rename from Sources/libpng/pngwrite.c rename to Sources/libpng/png/write.c index 02520519..13e38f9a 100644 --- a/Sources/libpng/pngwrite.c +++ b/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, diff --git a/Sources/libpng/pngwtran.c b/Sources/libpng/png/wtran.c similarity index 99% rename from Sources/libpng/pngwtran.c rename to Sources/libpng/png/wtran.c index 070caa54..ee3c2464 100644 --- a/Sources/libpng/pngwtran.c +++ b/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. diff --git a/Sources/libpng/pngwutil.c b/Sources/libpng/png/wutil.c similarity index 99% rename from Sources/libpng/pngwutil.c rename to Sources/libpng/png/wutil.c index 20cff320..79e9c934 100644 --- a/Sources/libpng/pngwutil.c +++ b/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 diff --git a/Sources/libzip/Android.mk b/Sources/libzip/Android.mk index 3d826d4a..de51de84 100644 --- a/Sources/libzip/Android.mk +++ b/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 \ - 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 + +LOCAL_C_INCLUDES := -I$(LOCAL_PATH) + +# load the common sources file of the platform +include $(LOCAL_PATH)/file.mk + +LOCAL_SRC_FILES := $(FILE_LIST) LOCAL_LDLIBS := -lz diff --git a/Sources/libzip/Linux.mk b/Sources/libzip/Linux.mk index 3d826d4a..de51de84 100644 --- a/Sources/libzip/Linux.mk +++ b/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 \ - 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 + +LOCAL_C_INCLUDES := -I$(LOCAL_PATH) + +# load the common sources file of the platform +include $(LOCAL_PATH)/file.mk + +LOCAL_SRC_FILES := $(FILE_LIST) LOCAL_LDLIBS := -lz diff --git a/Sources/libzip/file.mk b/Sources/libzip/file.mk new file mode 100644 index 00000000..1335079b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Sources/libzip/zip_add.c b/Sources/libzip/zip/add.c similarity index 98% rename from Sources/libzip/zip_add.c rename to Sources/libzip/zip/add.c index f6bdb2ab..d1428e5e 100644 --- a/Sources/libzip/zip_add.c +++ b/Sources/libzip/zip/add.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_add_dir.c b/Sources/libzip/zip/add_dir.c similarity index 99% rename from Sources/libzip/zip_add_dir.c rename to Sources/libzip/zip/add_dir.c index 493e28dd..c7911b56 100644 --- a/Sources/libzip/zip_add_dir.c +++ b/Sources/libzip/zip/add_dir.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_close.c b/Sources/libzip/zip/close.c similarity index 99% rename from Sources/libzip/zip_close.c rename to Sources/libzip/zip/close.c index c6885d96..cba0feeb 100644 --- a/Sources/libzip/zip_close.c +++ b/Sources/libzip/zip/close.c @@ -40,7 +40,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" static int add_data(struct zip *, struct zip_source *, struct zip_dirent *, FILE *); diff --git a/Sources/libzip/config.h b/Sources/libzip/zip/config.h similarity index 100% rename from Sources/libzip/config.h rename to Sources/libzip/zip/config.h diff --git a/Sources/libzip/zip_delete.c b/Sources/libzip/zip/delete.c similarity index 98% rename from Sources/libzip/zip_delete.c rename to Sources/libzip/zip/delete.c index a0545e4b..7e83fd2b 100644 --- a/Sources/libzip/zip_delete.c +++ b/Sources/libzip/zip/delete.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_dirent.c b/Sources/libzip/zip/dirent.c similarity index 99% rename from Sources/libzip/zip_dirent.c rename to Sources/libzip/zip/dirent.c index a0bf9b09..19750faf 100644 --- a/Sources/libzip/zip_dirent.c +++ b/Sources/libzip/zip/dirent.c @@ -40,7 +40,7 @@ #include #include -#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 *); diff --git a/Sources/libzip/zip_entry_free.c b/Sources/libzip/zip/entry_free.c similarity index 98% rename from Sources/libzip/zip_entry_free.c rename to Sources/libzip/zip/entry_free.c index c50c9434..cbc5693f 100644 --- a/Sources/libzip/zip_entry_free.c +++ b/Sources/libzip/zip/entry_free.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_entry_new.c b/Sources/libzip/zip/entry_new.c similarity index 99% rename from Sources/libzip/zip_entry_new.c rename to Sources/libzip/zip/entry_new.c index 7059b1b0..9cd4ec7f 100644 --- a/Sources/libzip/zip_entry_new.c +++ b/Sources/libzip/zip/entry_new.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_err_str.c b/Sources/libzip/zip/err_str.c similarity index 98% rename from Sources/libzip/zip_err_str.c rename to Sources/libzip/zip/err_str.c index 3fcdf173..be3f1772 100644 --- a/Sources/libzip/zip_err_str.c +++ b/Sources/libzip/zip/err_str.c @@ -3,7 +3,7 @@ from ./zip.h; make changes there. */ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error.c b/Sources/libzip/zip/error.c similarity index 99% rename from Sources/libzip/zip_error.c rename to Sources/libzip/zip/error.c index aab70794..06b17b7c 100644 --- a/Sources/libzip/zip_error.c +++ b/Sources/libzip/zip/error.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error_clear.c b/Sources/libzip/zip/error_clear.c similarity index 98% rename from Sources/libzip/zip_error_clear.c rename to Sources/libzip/zip/error_clear.c index 364383eb..8f087e2f 100644 --- a/Sources/libzip/zip_error_clear.c +++ b/Sources/libzip/zip/error_clear.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error_get.c b/Sources/libzip/zip/error_get.c similarity index 98% rename from Sources/libzip/zip_error_get.c rename to Sources/libzip/zip/error_get.c index 6d1c958c..318a0ec0 100644 --- a/Sources/libzip/zip_error_get.c +++ b/Sources/libzip/zip/error_get.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error_get_sys_type.c b/Sources/libzip/zip/error_get_sys_type.c similarity index 98% rename from Sources/libzip/zip_error_get_sys_type.c rename to Sources/libzip/zip/error_get_sys_type.c index 6c6f3807..6743c2a4 100644 --- a/Sources/libzip/zip_error_get_sys_type.c +++ b/Sources/libzip/zip/error_get_sys_type.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error_strerror.c b/Sources/libzip/zip/error_strerror.c similarity index 99% rename from Sources/libzip/zip_error_strerror.c rename to Sources/libzip/zip/error_strerror.c index 3d0951cf..f0a209d1 100644 --- a/Sources/libzip/zip_error_strerror.c +++ b/Sources/libzip/zip/error_strerror.c @@ -38,7 +38,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_error_to_str.c b/Sources/libzip/zip/error_to_str.c similarity index 99% rename from Sources/libzip/zip_error_to_str.c rename to Sources/libzip/zip/error_to_str.c index bdba41a6..f18b0923 100644 --- a/Sources/libzip/zip_error_to_str.c +++ b/Sources/libzip/zip/error_to_str.c @@ -38,7 +38,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_fclose.c b/Sources/libzip/zip/fclose.c similarity index 99% rename from Sources/libzip/zip_fclose.c rename to Sources/libzip/zip/fclose.c index 8709362d..b903413d 100644 --- a/Sources/libzip/zip_fclose.c +++ b/Sources/libzip/zip/fclose.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_file_error_clear.c b/Sources/libzip/zip/file_error_clear.c similarity index 98% rename from Sources/libzip/zip_file_error_clear.c rename to Sources/libzip/zip/file_error_clear.c index ef6fa10e..bf03d9e8 100644 --- a/Sources/libzip/zip_file_error_clear.c +++ b/Sources/libzip/zip/file_error_clear.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_file_error_get.c b/Sources/libzip/zip/file_error_get.c similarity index 98% rename from Sources/libzip/zip_file_error_get.c rename to Sources/libzip/zip/file_error_get.c index f20e011f..a899ea89 100644 --- a/Sources/libzip/zip_file_error_get.c +++ b/Sources/libzip/zip/file_error_get.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_file_get_offset.c b/Sources/libzip/zip/file_get_offset.c similarity index 99% rename from Sources/libzip/zip_file_get_offset.c rename to Sources/libzip/zip/file_get_offset.c index b96fd5e4..ace069cf 100644 --- a/Sources/libzip/zip_file_get_offset.c +++ b/Sources/libzip/zip/file_get_offset.c @@ -40,7 +40,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_file_strerror.c b/Sources/libzip/zip/file_strerror.c similarity index 98% rename from Sources/libzip/zip_file_strerror.c rename to Sources/libzip/zip/file_strerror.c index 9ba70f14..6a43e93a 100644 --- a/Sources/libzip/zip_file_strerror.c +++ b/Sources/libzip/zip/file_strerror.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_filerange_crc.c b/Sources/libzip/zip/filerange_crc.c similarity index 99% rename from Sources/libzip/zip_filerange_crc.c rename to Sources/libzip/zip/filerange_crc.c index 4d1ad566..c732ba8d 100644 --- a/Sources/libzip/zip_filerange_crc.c +++ b/Sources/libzip/zip/filerange_crc.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_fopen.c b/Sources/libzip/zip/fopen.c similarity index 98% rename from Sources/libzip/zip_fopen.c rename to Sources/libzip/zip/fopen.c index 6e2f7241..77fe7568 100644 --- a/Sources/libzip/zip_fopen.c +++ b/Sources/libzip/zip/fopen.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_fopen_index.c b/Sources/libzip/zip/fopen_index.c similarity index 99% rename from Sources/libzip/zip_fopen_index.c rename to Sources/libzip/zip/fopen_index.c index a330d697..6bdefc58 100644 --- a/Sources/libzip/zip_fopen_index.c +++ b/Sources/libzip/zip/fopen_index.c @@ -37,7 +37,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" static struct zip_file *_zip_file_new(struct zip *za); diff --git a/Sources/libzip/zip_fread.c b/Sources/libzip/zip/fread.c similarity index 99% rename from Sources/libzip/zip_fread.c rename to Sources/libzip/zip/fread.c index 2a7fb42c..aa4ab1b8 100644 --- a/Sources/libzip/zip_fread.c +++ b/Sources/libzip/zip/fread.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_free.c b/Sources/libzip/zip/free.c similarity index 99% rename from Sources/libzip/zip_free.c rename to Sources/libzip/zip/free.c index 76c3a967..9951f85e 100644 --- a/Sources/libzip/zip_free.c +++ b/Sources/libzip/zip/free.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_get_archive_comment.c b/Sources/libzip/zip/get_archive_comment.c similarity index 98% rename from Sources/libzip/zip_get_archive_comment.c rename to Sources/libzip/zip/get_archive_comment.c index 669eb702..9f2ebe3c 100644 --- a/Sources/libzip/zip_get_archive_comment.c +++ b/Sources/libzip/zip/get_archive_comment.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_get_archive_flag.c b/Sources/libzip/zip/get_archive_flag.c similarity index 98% rename from Sources/libzip/zip_get_archive_flag.c rename to Sources/libzip/zip/get_archive_flag.c index 4733d92b..0c1c0993 100644 --- a/Sources/libzip/zip_get_archive_flag.c +++ b/Sources/libzip/zip/get_archive_flag.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_get_file_comment.c b/Sources/libzip/zip/get_file_comment.c similarity index 99% rename from Sources/libzip/zip_get_file_comment.c rename to Sources/libzip/zip/get_file_comment.c index adace724..9a9041e5 100644 --- a/Sources/libzip/zip_get_file_comment.c +++ b/Sources/libzip/zip/get_file_comment.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_get_name.c b/Sources/libzip/zip/get_name.c similarity index 99% rename from Sources/libzip/zip_get_name.c rename to Sources/libzip/zip/get_name.c index 8f5050bd..cd571ce4 100644 --- a/Sources/libzip/zip_get_name.c +++ b/Sources/libzip/zip/get_name.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_get_num_files.c b/Sources/libzip/zip/get_num_files.c similarity index 98% rename from Sources/libzip/zip_get_num_files.c rename to Sources/libzip/zip/get_num_files.c index 1d9baa3d..01f4e483 100644 --- a/Sources/libzip/zip_get_num_files.c +++ b/Sources/libzip/zip/get_num_files.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zipint.h b/Sources/libzip/zip/int.h similarity index 99% rename from Sources/libzip/zipint.h rename to Sources/libzip/zip/int.h index f5a81b19..68ccb153 100644 --- a/Sources/libzip/zipint.h +++ b/Sources/libzip/zip/int.h @@ -40,8 +40,8 @@ #define ZIP_EXTERN __declspec(dllimport) #endif -#include "zip.h" -#include "config.h" +#include "zip/zip.h" +#include "zip/config.h" #ifndef HAVE_MKSTEMP int _zip_mkstemp(char *); diff --git a/Sources/libzip/zip_memdup.c b/Sources/libzip/zip/memdup.c similarity index 98% rename from Sources/libzip/zip_memdup.c rename to Sources/libzip/zip/memdup.c index 641125ed..98a9280b 100644 --- a/Sources/libzip/zip_memdup.c +++ b/Sources/libzip/zip/memdup.c @@ -34,7 +34,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/mkstemp.c b/Sources/libzip/zip/mkstemp.c similarity index 100% rename from Sources/libzip/mkstemp.c rename to Sources/libzip/zip/mkstemp.c diff --git a/Sources/libzip/zip_name_locate.c b/Sources/libzip/zip/name_locate.c similarity index 99% rename from Sources/libzip/zip_name_locate.c rename to Sources/libzip/zip/name_locate.c index baa6141f..c385cc51 100644 --- a/Sources/libzip/zip_name_locate.c +++ b/Sources/libzip/zip/name_locate.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_new.c b/Sources/libzip/zip/new.c similarity index 99% rename from Sources/libzip/zip_new.c rename to Sources/libzip/zip/new.c index 3e8ccee6..39d7f973 100644 --- a/Sources/libzip/zip_new.c +++ b/Sources/libzip/zip/new.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_open.c b/Sources/libzip/zip/open.c similarity index 99% rename from Sources/libzip/zip_open.c rename to Sources/libzip/zip/open.c index a65974df..eae1a1fb 100644 --- a/Sources/libzip/zip_open.c +++ b/Sources/libzip/zip/open.c @@ -40,7 +40,7 @@ #include #include -#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 *); diff --git a/Sources/libzip/zip_rename.c b/Sources/libzip/zip/rename.c similarity index 99% rename from Sources/libzip/zip_rename.c rename to Sources/libzip/zip/rename.c index 1d056bbe..144dbdc3 100644 --- a/Sources/libzip/zip_rename.c +++ b/Sources/libzip/zip/rename.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_replace.c b/Sources/libzip/zip/replace.c similarity index 99% rename from Sources/libzip/zip_replace.c rename to Sources/libzip/zip/replace.c index 6cdb80c5..723c3018 100644 --- a/Sources/libzip/zip_replace.c +++ b/Sources/libzip/zip/replace.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_set_archive_comment.c b/Sources/libzip/zip/set_archive_comment.c similarity index 99% rename from Sources/libzip/zip_set_archive_comment.c rename to Sources/libzip/zip/set_archive_comment.c index 343fa549..08ecc68b 100644 --- a/Sources/libzip/zip_set_archive_comment.c +++ b/Sources/libzip/zip/set_archive_comment.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_set_archive_flag.c b/Sources/libzip/zip/set_archive_flag.c similarity index 98% rename from Sources/libzip/zip_set_archive_flag.c rename to Sources/libzip/zip/set_archive_flag.c index 720e1f35..ee4303b0 100644 --- a/Sources/libzip/zip_set_archive_flag.c +++ b/Sources/libzip/zip/set_archive_flag.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_set_file_comment.c b/Sources/libzip/zip/set_file_comment.c similarity index 99% rename from Sources/libzip/zip_set_file_comment.c rename to Sources/libzip/zip/set_file_comment.c index bc1938e1..c0ffeeda 100644 --- a/Sources/libzip/zip_set_file_comment.c +++ b/Sources/libzip/zip/set_file_comment.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_set_name.c b/Sources/libzip/zip/set_name.c similarity index 99% rename from Sources/libzip/zip_set_name.c rename to Sources/libzip/zip/set_name.c index 5c7da3d7..a795d802 100644 --- a/Sources/libzip/zip_set_name.c +++ b/Sources/libzip/zip/set_name.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_source_buffer.c b/Sources/libzip/zip/source_buffer.c similarity index 99% rename from Sources/libzip/zip_source_buffer.c rename to Sources/libzip/zip/source_buffer.c index 1e9121c5..0d43845a 100644 --- a/Sources/libzip/zip_source_buffer.c +++ b/Sources/libzip/zip/source_buffer.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" struct read_data { const char *buf, *data, *end; diff --git a/Sources/libzip/zip_source_file.c b/Sources/libzip/zip/source_file.c similarity index 98% rename from Sources/libzip/zip_source_file.c rename to Sources/libzip/zip/source_file.c index eb1129a2..d1041f66 100644 --- a/Sources/libzip/zip_source_file.c +++ b/Sources/libzip/zip/source_file.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_source_filep.c b/Sources/libzip/zip/source_filep.c similarity index 99% rename from Sources/libzip/zip_source_filep.c rename to Sources/libzip/zip/source_filep.c index 53739341..4684854f 100644 --- a/Sources/libzip/zip_source_filep.c +++ b/Sources/libzip/zip/source_filep.c @@ -39,7 +39,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" struct read_file { char *fname; /* name of file to copy from */ diff --git a/Sources/libzip/zip_source_free.c b/Sources/libzip/zip/source_free.c similarity index 98% rename from Sources/libzip/zip_source_free.c rename to Sources/libzip/zip/source_free.c index 7a1632fb..6700d607 100644 --- a/Sources/libzip/zip_source_free.c +++ b/Sources/libzip/zip/source_free.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_source_function.c b/Sources/libzip/zip/source_function.c similarity index 98% rename from Sources/libzip/zip_source_function.c rename to Sources/libzip/zip/source_function.c index 91b183cb..64aa81a0 100644 --- a/Sources/libzip/zip_source_function.c +++ b/Sources/libzip/zip/source_function.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_source_zip.c b/Sources/libzip/zip/source_zip.c similarity index 99% rename from Sources/libzip/zip_source_zip.c rename to Sources/libzip/zip/source_zip.c index 3eef552a..c6f45b91 100644 --- a/Sources/libzip/zip_source_zip.c +++ b/Sources/libzip/zip/source_zip.c @@ -36,7 +36,7 @@ #include #include -#include "zipint.h" +#include "zip/int.h" struct read_zip { struct zip_file *zf; diff --git a/Sources/libzip/zip_stat.c b/Sources/libzip/zip/stat.c similarity index 98% rename from Sources/libzip/zip_stat.c rename to Sources/libzip/zip/stat.c index df1c0b50..890d0442 100644 --- a/Sources/libzip/zip_stat.c +++ b/Sources/libzip/zip/stat.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_stat_index.c b/Sources/libzip/zip/stat_index.c similarity index 99% rename from Sources/libzip/zip_stat_index.c rename to Sources/libzip/zip/stat_index.c index 60558e43..d9e2bd4a 100644 --- a/Sources/libzip/zip_stat_index.c +++ b/Sources/libzip/zip/stat_index.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_stat_init.c b/Sources/libzip/zip/stat_init.c similarity index 98% rename from Sources/libzip/zip_stat_init.c rename to Sources/libzip/zip/stat_init.c index 133ad304..e5e0160f 100644 --- a/Sources/libzip/zip_stat_init.c +++ b/Sources/libzip/zip/stat_init.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_strerror.c b/Sources/libzip/zip/strerror.c similarity index 98% rename from Sources/libzip/zip_strerror.c rename to Sources/libzip/zip/strerror.c index 9ebee144..6573eb77 100644 --- a/Sources/libzip/zip_strerror.c +++ b/Sources/libzip/zip/strerror.c @@ -33,7 +33,7 @@ -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_unchange.c b/Sources/libzip/zip/unchange.c similarity index 99% rename from Sources/libzip/zip_unchange.c rename to Sources/libzip/zip/unchange.c index ed0d4de6..b0ad9425 100644 --- a/Sources/libzip/zip_unchange.c +++ b/Sources/libzip/zip/unchange.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_unchange_all.c b/Sources/libzip/zip/unchange_all.c similarity index 98% rename from Sources/libzip/zip_unchange_all.c rename to Sources/libzip/zip/unchange_all.c index 54a7a0d2..9e437cd7 100644 --- a/Sources/libzip/zip_unchange_all.c +++ b/Sources/libzip/zip/unchange_all.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_unchange_archive.c b/Sources/libzip/zip/unchange_archive.c similarity index 98% rename from Sources/libzip/zip_unchange_archive.c rename to Sources/libzip/zip/unchange_archive.c index 8f9c024c..7a0f691f 100644 --- a/Sources/libzip/zip_unchange_archive.c +++ b/Sources/libzip/zip/unchange_archive.c @@ -35,7 +35,7 @@ #include -#include "zipint.h" +#include "zip/int.h" diff --git a/Sources/libzip/zip_unchange_data.c b/Sources/libzip/zip/unchange_data.c similarity index 98% rename from Sources/libzip/zip_unchange_data.c rename to Sources/libzip/zip/unchange_data.c index 6fe89f4f..94f61baa 100644 --- a/Sources/libzip/zip_unchange_data.c +++ b/Sources/libzip/zip/unchange_data.c @@ -37,7 +37,7 @@ #include -#include "zipint.h" +#include "zip/int.h" void _zip_unchange_data(struct zip_entry *ze) diff --git a/Sources/libzip/zip.h b/Sources/libzip/zip/zip.h similarity index 100% rename from Sources/libzip/zip.h rename to Sources/libzip/zip/zip.h