diff options
| author | Volker Lendecke <vl@samba.org> | 2021-01-09 18:22:15 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-01-12 00:10:30 +0000 |
| commit | 1701041d532bb6684c33e89420273631c063a2fa (patch) | |
| tree | 3a5393e777bfcf5135a40c7bd0666750f30abbf3 /lib | |
| parent | 9de2c2c12d29d2e1af1cb1b0d919191cd14522dc (diff) | |
| download | samba-1701041d532bb6684c33e89420273631c063a2fa.tar.gz | |
lib: Avoid "includes.h" in lib/util/charset/
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/charset/charset_macosxfs.c | 3 | ||||
| -rw-r--r-- | lib/util/charset/convert_string.c | 5 | ||||
| -rw-r--r-- | lib/util/charset/pull_push.c | 3 | ||||
| -rw-r--r-- | lib/util/charset/util_str.c | 4 | ||||
| -rw-r--r-- | lib/util/charset/util_unistr.c | 5 | ||||
| -rw-r--r-- | lib/util/charset/util_unistr_w.c | 6 |
6 files changed, 20 insertions, 6 deletions
diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c index 97a366a1532..55a6df85fb7 100644 --- a/lib/util/charset/charset_macosxfs.c +++ b/lib/util/charset/charset_macosxfs.c @@ -29,7 +29,8 @@ * source. */ -#include "includes.h" +#include "replace.h" +#include "charset.h" #include "charset_proto.h" #undef realloc diff --git a/lib/util/charset/convert_string.c b/lib/util/charset/convert_string.c index b725b53cb5a..96a3af68d27 100644 --- a/lib/util/charset/convert_string.c +++ b/lib/util/charset/convert_string.c @@ -21,8 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "includes.h" +#include "replace.h" #include "system/iconv.h" +#include "charset.h" +#include "lib/util/debug.h" +#include "lib/util/fault.h" /** * @file diff --git a/lib/util/charset/pull_push.c b/lib/util/charset/pull_push.c index cf25efa5a5e..1a79e6aa400 100644 --- a/lib/util/charset/pull_push.c +++ b/lib/util/charset/pull_push.c @@ -21,8 +21,9 @@ */ -#include "includes.h" +#include "replace.h" #include "system/locale.h" +#include "charset.h" /** * Copy a string from a unix char* src to a UCS2 destination, diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c index 3aa213fbe4f..2a4ccd93673 100644 --- a/lib/util/charset/util_str.c +++ b/lib/util/charset/util_str.c @@ -22,8 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "includes.h" +#include "replace.h" #include "system/locale.h" +#include "charset.h" +#include "lib/util/fault.h" #ifdef strcasecmp #undef strcasecmp diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c index 585cb787d09..4658d91b0c8 100644 --- a/lib/util/charset/util_unistr.c +++ b/lib/util/charset/util_unistr.c @@ -18,8 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "includes.h" +#include "replace.h" #include "system/locale.h" +#include "charset.h" +#include "lib/util/byteorder.h" +#include "lib/util/fault.h" /** String replace. diff --git a/lib/util/charset/util_unistr_w.c b/lib/util/charset/util_unistr_w.c index db8a8dde79f..88d5531bb71 100644 --- a/lib/util/charset/util_unistr_w.c +++ b/lib/util/charset/util_unistr_w.c @@ -19,7 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "includes.h" +#include "replace.h" +#include "charset.h" +#include "lib/util/byteorder.h" +#include "lib/util/debug.h" +#include "lib/util/fault.h" /* Copy into a smb_ucs2_t from a possibly unaligned buffer. Return the copied smb_ucs2_t */ #define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((const unsigned char *)(src))[0],\ |