From a6cc4f520358a182469dddb0d3f504d985b0523a Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 13 Sep 2022 22:08:08 +0100 Subject: [PATCH] backend: standard lib includes before local (fixes [[e1522e]]) --- backend/bmp.c | 4 ++-- backend/codablock.c | 4 ++-- backend/code16k.c | 4 ++-- backend/gif.c | 2 +- backend/hanxin.c | 2 +- backend/imail.c | 2 +- backend/medical.c | 2 +- backend/pcx.c | 4 ++-- backend/png.c | 3 +-- backend/telepen.c | 2 +- backend/tif.c | 6 +++--- 11 files changed, 17 insertions(+), 18 deletions(-) diff --git a/backend/bmp.c b/backend/bmp.c index 4579a57a..4fa6bc54 100644 --- a/backend/bmp.c +++ b/backend/bmp.c @@ -32,12 +32,12 @@ #include #include -#include "common.h" -#include "bmp.h" /* Bitmap header structure */ #ifdef _MSC_VER #include #include #endif +#include "common.h" +#include "bmp.h" /* Bitmap header structure */ INTERNAL int bmp_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf) { int i, row, column; diff --git a/backend/codablock.c b/backend/codablock.c index becfbecd..4af9d08f 100644 --- a/backend/codablock.c +++ b/backend/codablock.c @@ -30,11 +30,11 @@ */ /* SPDX-License-Identifier: BSD-3-Clause */ -#include "common.h" -#include "code128.h" #include #include #include +#include "common.h" +#include "code128.h" #define uchar unsigned char diff --git a/backend/code16k.c b/backend/code16k.c index 82605fff..1d91623e 100644 --- a/backend/code16k.c +++ b/backend/code16k.c @@ -34,10 +34,10 @@ /* Code 16k can hold up to 77 characters or 154 numbers */ -#include "common.h" -#include "code128.h" #include #include +#include "common.h" +#include "code128.h" /* Note using C128Table with extra entry at 106 (Triple Shift) for C16KTable */ diff --git a/backend/gif.c b/backend/gif.c index 2cebc2c9..c20096fe 100644 --- a/backend/gif.c +++ b/backend/gif.c @@ -32,11 +32,11 @@ #include #include -#include "common.h" #ifdef _MSC_VER #include #include #endif +#include "common.h" /* Limit initial LZW buffer size to this in expectation that compressed data will fit for typical scalings */ #define GIF_LZW_PAGE_SIZE 0x100000 /* Megabyte */ diff --git a/backend/hanxin.c b/backend/hanxin.c index 7963af94..17da3c7e 100644 --- a/backend/hanxin.c +++ b/backend/hanxin.c @@ -33,12 +33,12 @@ /* This code attempts to implement Han Xin Code according to ISO/IEC 20830:2021 * (previously ISO/IEC 20830 (draft 2019-10-10) and AIMD-015:2010 (Rev 0.8)) */ +#include #include #include "common.h" #include "reedsol.h" #include "hanxin.h" #include "eci.h" -#include /* Find which submode to use for a text character */ static int hx_getsubmode(const unsigned int input) { diff --git a/backend/imail.c b/backend/imail.c index cac921e4..421476c3 100644 --- a/backend/imail.c +++ b/backend/imail.c @@ -33,9 +33,9 @@ /* The function "USPS_MSB_Math_CRC11GenerateFrameCheckSequence" is Copyright (C) 2006 United States Postal Service */ +#include #include "common.h" #include "large.h" -#include #define SODIUM_MNS_F (IS_NUM_F | IS_MNS_F) /* SODIUM "0123456789-" */ diff --git a/backend/medical.c b/backend/medical.c index 0566bb33..b35db0d7 100644 --- a/backend/medical.c +++ b/backend/medical.c @@ -30,8 +30,8 @@ */ /* SPDX-License-Identifier: BSD-3-Clause */ -#include "common.h" #include +#include "common.h" INTERNAL int code39(struct zint_symbol *symbol, unsigned char source[], int length); diff --git a/backend/pcx.c b/backend/pcx.c index 13ed18a2..3d282b1a 100644 --- a/backend/pcx.c +++ b/backend/pcx.c @@ -32,12 +32,12 @@ #include #include -#include "common.h" -#include "pcx.h" /* PCX header structure */ #ifdef _MSC_VER #include #include #endif +#include "common.h" +#include "pcx.h" /* PCX header structure */ /* ZSoft PCX File Format Technical Reference Manual http://bespin.org/~qz/pc-gpe/pcx.txt */ INTERNAL int pcx_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf) { diff --git a/backend/png.c b/backend/png.c index 54e0d922..79eae94f 100644 --- a/backend/png.c +++ b/backend/png.c @@ -38,11 +38,10 @@ #include #include #endif -#include "common.h" - #include #include #include +#include "common.h" /* Note if change this need to change "backend/tests/test_png.c" definition also */ struct wpng_error_type { diff --git a/backend/telepen.c b/backend/telepen.c index f4315e52..166f347c 100644 --- a/backend/telepen.c +++ b/backend/telepen.c @@ -35,8 +35,8 @@ #define SODIUM_X_F (IS_NUM_F | IS_UX__F | IS_LX__F) /* SODIUM "0123456789Xx" */ -#include "common.h" #include +#include "common.h" static const char TeleTable[128][16] = { { "31313131" }, { "1131313111" }, { "33313111" }, { "1111313131" }, diff --git a/backend/tif.c b/backend/tif.c index 9db2fb05..7a93e5d9 100644 --- a/backend/tif.c +++ b/backend/tif.c @@ -33,13 +33,13 @@ #include #include #include -#include "common.h" -#include "tif.h" -#include "tif_lzw.h" #ifdef _MSC_VER #include #include #endif +#include "common.h" +#include "tif.h" +#include "tif_lzw.h" /* PhotometricInterpretation */ #define TIF_PMI_WHITEISZERO 0