diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
commit | 1d8b9e17ea13630aec475484da09ebba0366f7c8 (patch) | |
tree | 0c801f68561bfb0930a4ade80d7ca3a7940887ab /lib/printf-args.h | |
parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/printf-args.h')
-rw-r--r-- | lib/printf-args.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/printf-args.h b/lib/printf-args.h index 9b80bb39..24a86748 100644 --- a/lib/printf-args.h +++ b/lib/printf-args.h @@ -28,14 +28,9 @@ # define PRINTF_FETCHARGS printf_fetchargs #endif -/* Get size_t. */ +/* Get size_t, wchar_t. */ #include <stddef.h> -/* Get wchar_t. */ -#if HAVE_WCHAR_T -# include <stddef.h> -#endif - /* Get wint_t. */ #if HAVE_WINT_T # include <wchar.h> @@ -89,9 +84,7 @@ typedef enum TYPE_WIDE_CHAR, #endif TYPE_STRING, -#if HAVE_WCHAR_T TYPE_WIDE_STRING, -#endif TYPE_POINTER, TYPE_COUNT_SCHAR_POINTER, TYPE_COUNT_SHORT_POINTER, @@ -154,9 +147,7 @@ typedef struct wint_t a_wide_char; #endif const char* a_string; -#if HAVE_WCHAR_T const wchar_t* a_wide_string; -#endif void* a_pointer; signed char * a_count_schar_pointer; short * a_count_short_pointer; |