From c8e9c5d684f1ba15ca46e38493c995ad5be3646c Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 13 Nov 2017 16:14:46 +0200 Subject: FRIBIDI_CHUNK_SIZE is not used anywhere --- lib/common.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/common.h b/lib/common.h index d8395c3..816587a 100644 --- a/lib/common.h +++ b/lib/common.h @@ -88,23 +88,6 @@ # include #endif -/* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being - * allocated for data structure pools. */ -#ifndef FRIBIDI_CHUNK_SIZE -# if HAVE_ASM_PAGE_H -# ifndef __FRIBIDI_DOC -# include -# endif /* __FRIBIDI_DOC */ -# define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16) -# else /* !HAVE_ASM_PAGE_H */ -# define FRIBIDI_CHUNK_SIZE (4096 - 16) -# endif /* !HAVE_ASM_PAGE_H */ -#else /* FRIBIDI_CHUNK_SIZE */ -# if FRIBIDI_CHUNK_SIZE < 256 -# error "FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes." -# endif /* FRIBIDI_CHUNK_SIZE < 256 */ -#endif /* FRIBIDI_CHUNK_SIZE */ - /* FRIBIDI_BEGIN_STMT should be used at the beginning of your macro * definitions that are to behave like simple statements. Use * FRIBIDI_END_STMT at the end of the macro after the semicolon or brace. */ -- cgit v1.2.1 From 90325b276006f2cf344c77f00db541437345cff9 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 13 Nov 2017 17:14:20 +0200 Subject: Simplify fribidi-types.h a bit It is 2017, I think we can rely on the presence of one of these three int types headers. Also rename types that are not exposed in public headers to use the standard names. --- .indent.pro | 4 -- configure.ac | 2 +- gen.tab/gen-bidi-type-tab.c | 6 +-- gen.tab/gen-brackets-tab.c | 10 ++--- gen.tab/gen-brackets-type-tab.c | 10 ++--- gen.tab/gen-joining-type-tab.c | 6 +-- gen.tab/gen-mirroring-tab.c | 10 ++--- lib/fribidi-bidi-types.h | 4 +- lib/fribidi-brackets.c | 2 +- lib/fribidi-flags.h | 2 +- lib/fribidi-joining-types.h | 4 +- lib/fribidi-types.h | 96 +++++++++-------------------------------- 12 files changed, 48 insertions(+), 108 deletions(-) diff --git a/.indent.pro b/.indent.pro index 4359aac..dd9e1ac 100644 --- a/.indent.pro +++ b/.indent.pro @@ -14,7 +14,3 @@ -T FriBidiMemChunk -T FriBidiEnv -T FriBidiRun --T fribidi_uint8 --T fribidi_uint16 --T fribidi_uint32 --T fribidi_boolean diff --git a/configure.ac b/configure.ac index 8d324b3..1d93729 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h string.h strings.h inttypes.h wchar.h asm/page.h sys/times.h]) +AC_CHECK_HEADERS([stdlib.h string.h strings.h wchar.h asm/page.h sys/times.h]) # Checks for typedefs and structures. AC_C_CONST diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c index a29a3f8..c113ba3 100644 --- a/gen.tab/gen-bidi-type-tab.c +++ b/gen.tab/gen-bidi-type-tab.c @@ -324,9 +324,9 @@ gen_bidi_type_tab ( FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version " FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type); - printf ("#define PACKTAB_UINT8 fribidi_uint8\n" - "#define PACKTAB_UINT16 fribidi_uint16\n" - "#define PACKTAB_UINT32 fribidi_uint32\n\n"); + printf ("#define PACKTAB_UINT8 uint8_t\n" + "#define PACKTAB_UINT16 uint16_t\n" + "#define PACKTAB_UINT32 uint32_t\n\n"); if (!pack_table (table, FRIBIDI_UNICODE_CHARS, 1, LTR, max_depth, 3, names, diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c index f9616d4..810ed3f 100644 --- a/gen.tab/gen-brackets-tab.c +++ b/gen.tab/gen-brackets-tab.c @@ -292,13 +292,13 @@ gen_brackets_tab ( FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version " FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type); - printf ("#define PACKTAB_UINT8 fribidi_uint8\n" - "#define PACKTAB_UINT16 fribidi_uint16\n" - "#define PACKTAB_UINT32 fribidi_uint32\n\n"); + printf ("#define PACKTAB_UINT8 uint8_t\n" + "#define PACKTAB_UINT16 uint16_t\n" + "#define PACKTAB_UINT32 uint32_t\n\n"); key_bytes = max_dist <= 0x7f ? 1 : max_dist < 0x7fff ? 2 : 4; - key_type = key_bytes == 1 ? "fribidi_int8" : key_bytes == 2 ? - "fribidi_int16" : "fribidi_int32"; + key_type = key_bytes == 1 ? "int8_t" : key_bytes == 2 ? + "int16_t" : "int32_t"; if (!pack_table (table, FRIBIDI_UNICODE_CHARS, key_bytes, 0, max_depth, 1, NULL, diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c index 6c7334c..8111ade 100644 --- a/gen.tab/gen-brackets-type-tab.c +++ b/gen.tab/gen-brackets-type-tab.c @@ -191,13 +191,13 @@ gen_brackets_tab ( FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version " FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type); - printf ("#define PACKTAB_UINT8 fribidi_uint8\n" - "#define PACKTAB_UINT16 fribidi_uint16\n" - "#define PACKTAB_UINT32 fribidi_uint32\n\n"); + printf ("#define PACKTAB_UINT8 uint8_t\n" + "#define PACKTAB_UINT16 uint16_t\n" + "#define PACKTAB_UINT32 uint32_t\n\n"); key_bytes = 1; - key_type = key_bytes == 1 ? "fribidi_int8" : key_bytes == 2 ? - "fribidi_int16" : "fribidi_int32"; + key_type = key_bytes == 1 ? "int8_t" : key_bytes == 2 ? + "int16_t" : "int32_t"; if (!pack_table (table, FRIBIDI_UNICODE_CHARS, key_bytes, 0, max_depth, 1, NULL, diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c index 8a3f024..037b455 100644 --- a/gen.tab/gen-joining-type-tab.c +++ b/gen.tab/gen-joining-type-tab.c @@ -319,9 +319,9 @@ gen_joining_type_tab ( FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type[0], data_file_type[1]); - printf ("#define PACKTAB_UINT8 fribidi_uint8\n" - "#define PACKTAB_UINT16 fribidi_uint16\n" - "#define PACKTAB_UINT32 fribidi_uint32\n\n"); + printf ("#define PACKTAB_UINT8 uint8_t\n" + "#define PACKTAB_UINT16 uint16_t\n" + "#define PACKTAB_UINT32 uint32_t\n\n"); if (!pack_table (table, FRIBIDI_UNICODE_CHARS, 1, U, max_depth, 1, names, diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c index f577e68..7a042ef 100644 --- a/gen.tab/gen-mirroring-tab.c +++ b/gen.tab/gen-mirroring-tab.c @@ -200,13 +200,13 @@ gen_mirroring_tab ( FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version " FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type); - printf ("#define PACKTAB_UINT8 fribidi_uint8\n" - "#define PACKTAB_UINT16 fribidi_uint16\n" - "#define PACKTAB_UINT32 fribidi_uint32\n\n"); + printf ("#define PACKTAB_UINT8 uint8_t\n" + "#define PACKTAB_UINT16 uint16_t\n" + "#define PACKTAB_UINT32 uint32_t\n\n"); key_bytes = max_dist <= 0x7f ? 1 : max_dist < 0x7fff ? 2 : 4; - key_type = key_bytes == 1 ? "fribidi_int8" : key_bytes == 2 ? - "fribidi_int16" : "fribidi_int32"; + key_type = key_bytes == 1 ? "int8_t" : key_bytes == 2 ? + "int16_t" : "int32_t"; if (!pack_table (table, FRIBIDI_UNICODE_CHARS, key_bytes, 0, max_depth, 1, NULL, diff --git a/lib/fribidi-bidi-types.h b/lib/fribidi-bidi-types.h index bff0021..be2890c 100644 --- a/lib/fribidi-bidi-types.h +++ b/lib/fribidi-bidi-types.h @@ -209,7 +209,7 @@ typedef enum #else -typedef fribidi_uint32 FriBidiCharType; +typedef uint32_t FriBidiCharType; # define FRIBIDI_TYPE_LTR FRIBIDI_TYPE_LTR_VAL # define FRIBIDI_TYPE_RTL FRIBIDI_TYPE_RTL_VAL # define FRIBIDI_TYPE_AL FRIBIDI_TYPE_AL_VAL @@ -234,7 +234,7 @@ typedef fribidi_uint32 FriBidiCharType; # define FRIBIDI_TYPE_FSI FRIBIDI_TYPE_PDF_FSI # define FRIBIDI_TYPE_PDI FRIBIDI_TYPE_PDF_PDI -typedef fribidi_uint32 FriBidiParType; +typedef uint32_t FriBidiParType; # define FRIBIDI_PAR_LTR FRIBIDI_TYPE_LTR_VAL # define FRIBIDI_PAR_RTL FRIBIDI_TYPE_RTL_VAL # define FRIBIDI_PAR_ON FRIBIDI_TYPE_ON_VAL diff --git a/lib/fribidi-brackets.c b/lib/fribidi-brackets.c index b7b1342..94185ff 100644 --- a/lib/fribidi-brackets.c +++ b/lib/fribidi-brackets.c @@ -46,7 +46,7 @@ fribidi_get_bracket ( ) { FriBidiBracketType bracket_type; - register fribidi_uint8 char_type; + register uint8_t char_type; /* The bracket type from the table may be: 0 - Not a bracket diff --git a/lib/fribidi-flags.h b/lib/fribidi-flags.h index f69b8de..31558a4 100644 --- a/lib/fribidi-flags.h +++ b/lib/fribidi-flags.h @@ -38,7 +38,7 @@ #include "fribidi-begindecls.h" -typedef fribidi_uint32 FriBidiFlags; +typedef uint32_t FriBidiFlags; /* * Define option flags that various functions use. Each mask has diff --git a/lib/fribidi-joining-types.h b/lib/fribidi-joining-types.h index 6597d8a..ac4d22d 100644 --- a/lib/fribidi-joining-types.h +++ b/lib/fribidi-joining-types.h @@ -95,12 +95,12 @@ enum _FriBidiJoiningTypeEnum #ifdef __FRIBIDI_DOC typedef enum _FriBidiJoiningTypeEnum FriBidiJoiningType; #else /* !__FRIBIDI_DOC */ -typedef fribidi_uint8 FriBidiJoiningType; +typedef uint8_t FriBidiJoiningType; #endif /* !__FRIBIDI_DOC */ /* FriBidiArabicProp is essentially the same type as FriBidiJoiningType, but * not limited to the few values returned by fribidi_get_joining_type. */ -typedef fribidi_uint8 FriBidiArabicProp; +typedef uint8_t FriBidiArabicProp; /* * The equivalent of JoiningType values for ArabicProp diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h index f95742a..de144c4 100644 --- a/lib/fribidi-types.h +++ b/lib/fribidi-types.h @@ -33,87 +33,31 @@ #ifndef _FRIBIDI_TYPES_H #define _FRIBIDI_TYPES_H +#ifdef HAVE_CONFIG_H +# include +#endif + #include "fribidi-common.h" #include "fribidi-begindecls.h" -# if defined(HAVE_INTTYPES_H) || defined(HAVE_STDINT_H) -# ifndef __FRIBIDI_DOC -# if HAVE_INTTYPES_H -# include -# elif HAVE_STDINT_H -# include -# endif /* !HAVE_STDINT_H */ -# endif /* !__FRIBIDI_DOC */ -# define FRIBIDI_INT8_LOCAL int8_t -# define FRIBIDI_INT16_LOCAL int16_t -# define FRIBIDI_INT32_LOCAL int32_t -# define FRIBIDI_UINT8_LOCAL uint8_t -# define FRIBIDI_UINT16_LOCAL uint16_t -# define FRIBIDI_UINT32_LOCAL uint32_t -# else /* no int types */ -# define FRIBIDI_INT8_LOCAL signed char -# define FRIBIDI_UINT8_LOCAL unsigned char -# if !defined(FRIBIDI_SIZEOF_INT) || FRIBIDI_SIZEOF_INT >= 4 -# define FRIBIDI_INT16_LOCAL signed short -# define FRIBIDI_UINT16_LOCAL unsigned short -# define FRIBIDI_INT32_LOCAL signed int -# define FRIBIDI_UINT32_LOCAL unsigned int -# else /* SIZEOF_INT < 4 */ -# define FRIBIDI_INT16_LOCAL signed int -# define FRIBIDI_UINT16_LOCAL unsigned int -# define FRIBIDI_INT32_LOCAL signed long -# define FRIBIDI_UINT32_LOCAL unsigned long -# endif /* SIZEOF_INT < 4 */ -# endif /* no int types */ -# define FRIBIDI_BOOLEAN_LOCAL int -# if SIZEOF_WCHAR_T >= 4 -# ifndef __FRIBIDI_DOC -# if STDC_HEADERS -# include -# include -# else /* !STDC_HEADERS */ -# if HAVE_STDLIB_H -# include -# endif /* !HAVE_STDLIB_H */ -# endif /* !STDC_HEADERS */ -# endif /* !__FRIBIDI_DOC */ -# define FRIBIDI_UNICHAR_LOCAL wchar_t -# else /* SIZEOF_WCHAR_T < 4 */ -# define FRIBIDI_UNICHAR_LOCAL fribidi_uint32 -# endif /* SIZEOF_WCHAR_T < 4 */ - -#if FRIBIDI_INT_TYPES+0 -#else -# define FRIBIDI_INT8 FRIBIDI_INT8_LOCAL -# define FRIBIDI_INT16 FRIBIDI_INT16_LOCAL -# define FRIBIDI_INT32 FRIBIDI_INT32_LOCAL -# define FRIBIDI_UINT8 FRIBIDI_UINT8_LOCAL -# define FRIBIDI_UINT16 FRIBIDI_UINT16_LOCAL -# define FRIBIDI_UINT32 FRIBIDI_UINT32_LOCAL -#endif /* !FRIBIDI_INT_TYPES */ -#ifndef FRIBIDI_BOOLEAN -# define FRIBIDI_BOOLEAN FRIBIDI_BOOLEAN_LOCAL -#endif /* !FRIBIDI_BOOLEAN */ -#ifndef FRIBIDI_UNICHAR -# define FRIBIDI_UNICHAR FRIBIDI_UNICHAR_LOCAL -#endif /* !FRIBIDI_UNICHAR */ -#ifndef FRIBIDI_STR_INDEX -# define FRIBIDI_STR_INDEX int -#endif /* FRIBIDI_STR_INDEX */ - - -typedef FRIBIDI_INT8 fribidi_int8; -typedef FRIBIDI_INT16 fribidi_int16; -typedef FRIBIDI_INT32 fribidi_int32; -typedef FRIBIDI_UINT8 fribidi_uint8; -typedef FRIBIDI_UINT16 fribidi_uint16; -typedef FRIBIDI_UINT32 fribidi_uint32; -typedef FRIBIDI_BOOLEAN fribidi_boolean; - -typedef FRIBIDI_UNICHAR FriBidiChar; -typedef FRIBIDI_STR_INDEX FriBidiStrIndex; +#ifndef __FRIBIDI_DOC +# if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || \ + defined (_sgi) || defined (__sun) || defined (sun) || \ + defined (__digital__) || defined (__HP_cc) +# include +# elif defined (_AIX) +# include +# else +# include +# endif +#endif + +typedef int fribidi_boolean; + +typedef uint32_t FriBidiChar; +typedef int FriBidiStrIndex; /* The MSB is used to indicate an opening bracket */ typedef FriBidiChar FriBidiBracketType; -- cgit v1.2.1 From e1c47ff159bb6853e78dda5a59bb137beceda8d2 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 13 Nov 2017 17:19:09 +0200 Subject: Fix build with -Werror=undef Pango meson build sets this by default. --- lib/fribidi-common.h | 4 ++-- lib/fribidi-deprecated.c | 2 +- lib/fribidi-unicode.h | 2 +- lib/fribidi.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h index 0dc9c5b..9511d55 100644 --- a/lib/fribidi-common.h +++ b/lib/fribidi-common.h @@ -32,7 +32,7 @@ #ifndef _FRIBIDI_COMMON_H #define _FRIBIDI_COMMON_H -#if DONT_HAVE_FRIBIDI_CONFIG_H+0 +#ifdef DONT_HAVE_FRIBIDI_CONFIG_H # define FRIBIDI "fribidi" # define FRIBIDI_NAME "fribidi" # define FRIBIDI_VERSION "unknown" @@ -42,7 +42,7 @@ # include "fribidi-config.h" #endif /* !DONT_HAVE_FRIBIDI_CONFIG_H */ -#if HAVE_FRIBIDI_CUSTOM_H+0 +#ifdef HAVE_FRIBIDI_CUSTOM_H # include #endif /* HAVE_FRIBIDI_CUSTOM_H */ diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c index 636622a..fe6ea82 100644 --- a/lib/fribidi-deprecated.c +++ b/lib/fribidi-deprecated.c @@ -40,7 +40,7 @@ #include #include -#if FRIBIDI_NO_DEPRECATED+0 +#ifdef FRIBIDI_NO_DEPRECATED #else static FriBidiFlags flags = FRIBIDI_FLAGS_DEFAULT | FRIBIDI_FLAGS_ARABIC; diff --git a/lib/fribidi-unicode.h b/lib/fribidi-unicode.h index b572afd..546d664 100644 --- a/lib/fribidi-unicode.h +++ b/lib/fribidi-unicode.h @@ -43,7 +43,7 @@ #define FRIBIDI_UNICODE_CHARS (sizeof(FriBidiChar) >= 4 ? 0x110000 : 0xFFFE) /* Unicode version - FRIBIDI_UNICODE_VERSION */ -#if DONT_HAVE_FRIBIDI_UNICODE_VERSION_H+0 +#ifdef DONT_HAVE_FRIBIDI_UNICODE_VERSION_H # define FRIBIDI_UNICODE_VERSION "unknown" #else /* !DONT_HAVE_FRIBIDI_UNICODE_VERSION_H */ # include "fribidi-unicode-version.h" diff --git a/lib/fribidi.h b/lib/fribidi.h index 1e10a8e..79fb932 100644 --- a/lib/fribidi.h +++ b/lib/fribidi.h @@ -52,7 +52,7 @@ #endif /* FRIBIDI_CHARSETS */ -#if FRIBIDI_NO_DEPRECATED+0 +#ifdef FRIBIDI_NO_DEPRECATED #else # include "fribidi-deprecated.h" #endif /* !FRIBIDI_NO_DEPRECATED */ -- cgit v1.2.1