fribidi compilation fixes for all platforms

8 files changed, 472 insertions, 3 deletions

diff --git a/3party/fribidi/config_android.h b/3party/fribidi/config_android.h
new file mode 100644
index 0000000000..638082424b
--- /dev/null
+++ b/3party/fribidi/config_android.h
@@ -0,0 +1,105 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you want to include debug code in the library */
+/* #undef DEBUG */
+
+/* Define to 1 if you have the <asm/page.h> header file. */
+/* #undef HAVE_ASM_PAGE_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#define HAVE_STRINGIZE 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "fribidi"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://fribidi.org/bug"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU FriBidi"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU FriBidi 0.19.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "fribidi"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.19.2"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you want to use simple mallocs instead of memory chunks */
+/* #undef USE_SIMPLE_MALLOC */
+
+/* Version number of package */
+#define VERSION "0.19.2"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
diff --git a/3party/fribidi/config_ios.h b/3party/fribidi/config_ios.h
new file mode 100644
index 0000000000..4c5ab821b5
--- /dev/null
+++ b/3party/fribidi/config_ios.h
@@ -0,0 +1,105 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you want to include debug code in the library */
+/* #undef DEBUG */
+
+/* Define to 1 if you have the <asm/page.h> header file. */
+/* #undef HAVE_ASM_PAGE_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#define HAVE_STRINGIZE 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "fribidi"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://fribidi.org/bug"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU FriBidi"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU FriBidi 0.19.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "fribidi"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.19.2"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you want to use simple mallocs instead of memory chunks */
+/* #undef USE_SIMPLE_MALLOC */
+
+/* Version number of package */
+#define VERSION "0.19.2"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
diff --git a/3party/fribidi/config_mac.h b/3party/fribidi/config_mac.h
new file mode 100644
index 0000000000..02334ad425
--- /dev/null
+++ b/3party/fribidi/config_mac.h
@@ -0,0 +1,105 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you want to include debug code in the library */
+/* #undef DEBUG */
+
+/* Define to 1 if you have the <asm/page.h> header file. */
+/* #undef HAVE_ASM_PAGE_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#define HAVE_STRINGIZE 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "fribidi"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://fribidi.org/bug"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU FriBidi"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU FriBidi 0.19.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "fribidi"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.19.2"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 8
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you want to use simple mallocs instead of memory chunks */
+/* #undef USE_SIMPLE_MALLOC */
+
+/* Version number of package */
+#define VERSION "0.19.2"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
diff --git a/3party/fribidi/config_omim.h b/3party/fribidi/config_omim.h
new file mode 100644
index 0000000000..b58109c316
--- /dev/null
+++ b/3party/fribidi/config_omim.h
@@ -0,0 +1,17 @@
+#include "../../std/target_os.hpp"
+
+#if defined(OMIM_OS_MAC)
+  #include "config_mac.h"
+
+#elif defined(OMIM_OS_ANDROID)
+  #include "config_android.h"
+
+#elif defined(OMIM_OS_IPHONE)
+  #include "config_ios.h"
+
+#elif defined(OMIM_OS_WINDOWS)
+  #include "config_win32.h"
+
+#else
+#error "Add your platform"
+#endif
diff --git a/3party/fribidi/config_win32.h b/3party/fribidi/config_win32.h
new file mode 100644
index 0000000000..09bbc425f0
--- /dev/null
+++ b/3party/fribidi/config_win32.h
@@ -0,0 +1,105 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you want to include debug code in the library */
+/* #undef DEBUG */
+
+/* Define to 1 if you have the <asm/page.h> header file. */
+/* #undef HAVE_ASM_PAGE_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#define HAVE_STRINGIZE 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "fribidi"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://fribidi.org/bug"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU FriBidi"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU FriBidi 0.19.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "fribidi"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.19.2"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 2
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you want to use simple mallocs instead of memory chunks */
+/* #undef USE_SIMPLE_MALLOC */
+
+/* Version number of package */
+#define VERSION "0.19.2"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
diff --git a/3party/fribidi/fribidi.pro b/3party/fribidi/fribidi.pro
index f2a0510005..04c22c03da 100644
--- a/3party/fribidi/fribidi.pro
+++ b/3party/fribidi/fribidi.pro
@@ -11,6 +11,11 @@ DEPENDENCIES =
 include($$ROOT_DIR/common.pri)
 
 HEADERS += \
+    config_omim.h \
+    config_mac.h \
+    config_android.h \
+    config_ios.h \
+    config_win32.h \
     lib/run.h \
     lib/mem.h \
     lib/joining-types.h \
diff --git a/3party/fribidi/lib/common.h b/3party/fribidi/lib/common.h
index 7615cccbaf..46390d77be 100644
--- a/3party/fribidi/lib/common.h
+++ b/3party/fribidi/lib/common.h
@@ -32,9 +32,10 @@
 #ifndef _COMMON_H
 #define _COMMON_H
 
-#if HAVE_CONFIG_H+0
-# include <config.h>
-#endif
+//#if HAVE_CONFIG_H+0
+//# include <config.h>
+//#endif
+#include "../config_omim.h"
 
 #include <fribidi-common.h>
 
diff --git a/3party/fribidi/lib/fribidi-config.h b/3party/fribidi/lib/fribidi-config.h
new file mode 100644
index 0000000000..80fc8c2f54
--- /dev/null
+++ b/3party/fribidi/lib/fribidi-config.h
@@ -0,0 +1,26 @@
+/* lib/fribidi-config.h.  Generated from fribidi-config.h.in by configure. */
+/* Not copyrighted, in public domain. */
+#ifndef FRIBIDI_CONFIG_H
+#define FRIBIDI_CONFIG_H
+
+#define FRIBIDI "fribidi"
+#define FRIBIDI_NAME "GNU FriBidi"
+#define FRIBIDI_BUGREPORT "http://fribidi.org/bug"
+
+#define FRIBIDI_VERSION "0.19.2"
+#define FRIBIDI_MAJOR_VERSION 0
+#define FRIBIDI_MINOR_VERSION 19
+#define FRIBIDI_MICRO_VERSION 2
+#define FRIBIDI_INTERFACE_VERSION 3
+#define FRIBIDI_INTERFACE_VERSION_STRING "3"
+
+/* Define to 1 if you want charset conversion codes in the library */
+#define FRIBIDI_CHARSETS 0
+
+/* Define to 1 if you want to use glib */
+#define FRIBIDI_USE_GLIB 0
+
+/* The size of a `int', as computed by sizeof. */
+#define FRIBIDI_SIZEOF_INT 4
+
+#endif /* FRIBIDI_CONFIG_H */