kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=34597400013b39b4c1900973eccf8e70cb150ad4
commit 34597400013b39b4c1900973eccf8e70cb150ad4 Author: Kim Woelders <[email protected]> Date: Thu Mar 3 12:00:10 2022 +0100 Loader includes tweaks --- src/modules/loaders/decompress_load.c | 2 -- src/modules/loaders/loader_argb.c | 2 -- src/modules/loaders/loader_bmp.c | 2 -- src/modules/loaders/loader_common.h | 6 ++++++ src/modules/loaders/loader_ff.c | 1 - src/modules/loaders/loader_heif.c | 1 - src/modules/loaders/loader_ico.c | 1 - src/modules/loaders/loader_lbm.c | 2 -- src/modules/loaders/loader_png.c | 1 - src/modules/loaders/loader_pnm.c | 1 - src/modules/loaders/loader_svg.c | 1 - src/modules/loaders/loader_tga.c | 1 - src/modules/loaders/loader_tiff.c | 1 - src/modules/loaders/loader_webp.c | 1 - src/modules/loaders/loader_xbm.c | 2 -- src/modules/loaders/loader_xpm.c | 2 -- 16 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/modules/loaders/decompress_load.c b/src/modules/loaders/decompress_load.c index e2f796f..c4683b1 100644 --- a/src/modules/loaders/decompress_load.c +++ b/src/modules/loaders/decompress_load.c @@ -1,7 +1,5 @@ #include "loader_common.h" -#include <sys/mman.h> - int decompress_load(ImlibImage * im, int load_data, const char *const *pext, int next, imlib_decompress_load_f * fdec) diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c index e8e0bf0..564ce6f 100644 --- a/src/modules/loaders/loader_argb.c +++ b/src/modules/loaders/loader_argb.c @@ -1,7 +1,5 @@ #include "loader_common.h" -#include <sys/mman.h> - static struct { const unsigned char *data, *dptr; unsigned int size; diff --git a/src/modules/loaders/loader_bmp.c b/src/modules/loaders/loader_bmp.c index 20c1d49..873f0cb 100644 --- a/src/modules/loaders/loader_bmp.c +++ b/src/modules/loaders/loader_bmp.c @@ -9,8 +9,6 @@ */ #include "loader_common.h" -#include <sys/mman.h> - #define DBG_PFX "LDR-bmp" #define Dx(fmt...) diff --git a/src/modules/loaders/loader_common.h b/src/modules/loaders/loader_common.h index f81725b..a6c46db 100644 --- a/src/modules/loaders/loader_common.h +++ b/src/modules/loaders/loader_common.h @@ -2,6 +2,12 @@ #define __LOADER_COMMON_H 1 #include "config.h" + +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/mman.h> + #include "common.h" #include "debug.h" #include "image.h" diff --git a/src/modules/loaders/loader_ff.c b/src/modules/loaders/loader_ff.c index 22693ae..9c0a555 100644 --- a/src/modules/loaders/loader_ff.c +++ b/src/modules/loaders/loader_ff.c @@ -3,7 +3,6 @@ #include <stdint.h> #include <arpa/inet.h> -#include <sys/mman.h> #define mm_check(p) ((const char *)(p) <= (const char *)fdata + im->fsize) diff --git a/src/modules/loaders/loader_heif.c b/src/modules/loaders/loader_heif.c index 53434ab..0f3a018 100644 --- a/src/modules/loaders/loader_heif.c +++ b/src/modules/loaders/loader_heif.c @@ -7,7 +7,6 @@ #include "loader_common.h" #include <libheif/heif.h> -#include <sys/mman.h> #define HEIF_BYTES_TO_CHECK 12L #define HEIF_8BIT_TO_PIXEL_ARGB(plane, has_alpha) \ diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c index dfbb5ce..a56eecd 100644 --- a/src/modules/loaders/loader_ico.c +++ b/src/modules/loaders/loader_ico.c @@ -8,7 +8,6 @@ #include "loader_common.h" #include <limits.h> -#include <sys/mman.h> #define DBG_PFX "LDR-ico" diff --git a/src/modules/loaders/loader_lbm.c b/src/modules/loaders/loader_lbm.c index 4446ad9..41e72aa 100644 --- a/src/modules/loaders/loader_lbm.c +++ b/src/modules/loaders/loader_lbm.c @@ -13,8 +13,6 @@ #include "loader_common.h" -#include <sys/mman.h> - #define DBG_PFX "LDR-lbm" #define L2RLONG(a) ((((int)((a)[0]) & 0xff) << 24) + (((int)((a)[1]) & 0xff) << 16) + (((int)((a)[2]) & 0xff) << 8) + ((int)((a)[3]) & 0xff)) diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c index 73874d0..eff0f44 100644 --- a/src/modules/loaders/loader_png.c +++ b/src/modules/loaders/loader_png.c @@ -2,7 +2,6 @@ #include <png.h> #include <stdint.h> -#include <sys/mman.h> #include <arpa/inet.h> #define DBG_PFX "LDR-png" diff --git a/src/modules/loaders/loader_pnm.c b/src/modules/loaders/loader_pnm.c index 2d3312b..d7dcf6b 100644 --- a/src/modules/loaders/loader_pnm.c +++ b/src/modules/loaders/loader_pnm.c @@ -2,7 +2,6 @@ #include <ctype.h> #include <stdbool.h> -#include <sys/mman.h> #define DBG_PFX "LDR-pnm" diff --git a/src/modules/loaders/loader_svg.c b/src/modules/loaders/loader_svg.c index 4abebf4..61b106c 100644 --- a/src/modules/loaders/loader_svg.c +++ b/src/modules/loaders/loader_svg.c @@ -1,7 +1,6 @@ #include "loader_common.h" #include <math.h> -#include <sys/mman.h> #include <librsvg/rsvg.h> #define DBG_PFX "LDR-svg" diff --git a/src/modules/loaders/loader_tga.c b/src/modules/loaders/loader_tga.c index 0912e38..e22bff5 100644 --- a/src/modules/loaders/loader_tga.c +++ b/src/modules/loaders/loader_tga.c @@ -12,7 +12,6 @@ #include "loader_common.h" #include <stdint.h> -#include <sys/mman.h> #define DBG_PFX "LDR-tga" diff --git a/src/modules/loaders/loader_tiff.c b/src/modules/loaders/loader_tiff.c index 95ea702..88a8f8e 100644 --- a/src/modules/loaders/loader_tiff.c +++ b/src/modules/loaders/loader_tiff.c @@ -6,7 +6,6 @@ #include <setjmp.h> #include <stdint.h> #include <tiffio.h> -#include <sys/mman.h> /* This is a wrapper data structure for TIFFRGBAImage, so that data can be */ /* passed into the callbacks. More elegent, I think, than a bunch of globals */ diff --git a/src/modules/loaders/loader_webp.c b/src/modules/loaders/loader_webp.c index f19c2e1..3fcc7f3 100644 --- a/src/modules/loaders/loader_webp.c +++ b/src/modules/loaders/loader_webp.c @@ -1,6 +1,5 @@ #include "loader_common.h" -#include <sys/mman.h> #include <webp/decode.h> #include <webp/demux.h> #include <webp/encode.h> diff --git a/src/modules/loaders/loader_xbm.c b/src/modules/loaders/loader_xbm.c index efb4253..b73d47b 100644 --- a/src/modules/loaders/loader_xbm.c +++ b/src/modules/loaders/loader_xbm.c @@ -4,8 +4,6 @@ #define _GNU_SOURCE /* memmem() */ #include "loader_common.h" -#include <sys/mman.h> - #define DBG_PFX "LDR-xbm" static struct { diff --git a/src/modules/loaders/loader_xpm.c b/src/modules/loaders/loader_xpm.c index 7a59d0d..44642e2 100644 --- a/src/modules/loaders/loader_xpm.c +++ b/src/modules/loaders/loader_xpm.c @@ -1,8 +1,6 @@ #define _GNU_SOURCE /* memmem() */ #include "loader_common.h" -#include <sys/mman.h> - static struct { const char *data, *dptr; unsigned int size; --
