Reverted fribidi to original untouched state

3party/fribidi/config.log

@@ -1,273 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by GNU FriBidi configure 0.19.2, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  $ ./configure install
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = Viktor-PC
-uname -m = i686
-uname -r = 1.0.12(0.46/3/2)
-uname -s = MINGW32_NT-6.0
-uname -v = 2010-02-05 01:08
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo      = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /c/Users/Viktor/bin
-PATH: .
-PATH: /usr/local/bin
-PATH: /mingw/bin
-PATH: /bin
-PATH: /c/Perl/site/bin
-PATH: /c/Perl/bin
-PATH: /c/Program Files/NVIDIA Corporation/PhysX/Common
-PATH: /c/Program Files/Intel/VTune/Shared/Bin
-PATH: /c/mapnik-0.7.1/lib
-PATH: /c/Python26/Scripts
-PATH: /c/Python26/
-PATH: /c/Program Files/Intel/VTune/CGGlbCache
-PATH: /c/Program Files/Intel/VTune/Analyzer/Bin
-PATH: /c/Program Files/PC Connectivity Solution/
-PATH: /c/Windows/system32
-PATH: /c/Windows
-PATH: /c/Windows/System32/Wbem
-PATH: /c/Program Files/CyberLink/Power2Go
-PATH: /c/Program Files/Microsoft SQL Server/90/Tools/binn/
-PATH: /c/Program Files/Common Files/Compuware
-PATH: /c/Program Files/TortoiseSVN/bin
-PATH: /c/Program Files/Common Files/Intel/Shared Files/IDVC
-PATH: /c/Program Files/TortoiseGit/bin
-PATH: /c/Users/Viktor/AppData/Roaming/Python/Scripts
-PATH: /c/mapnik-0.7.1/lib
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:2116: checking for a BSD-compatible install
-configure:2184: result: ./install-sh -c
-configure:2195: checking whether build environment is sane
-configure:2238: result: yes
-configure:2263: checking for a thread-safe mkdir -p
-configure:2302: result: /bin/mkdir -p
-configure:2315: checking for gawk
-configure:2331: found /bin/gawk
-configure:2342: result: gawk
-configure:2353: checking whether make sets $(MAKE)
-configure:2379: result: no
-configure:2592: checking for install-gcc
-configure:2622: result: no
-configure:2632: checking for gcc
-configure:2662: result: no
-configure:2685: checking for install-cc
-configure:2715: result: no
-configure:2725: checking for cc
-configure:2772: result: no
-configure:2784: checking for install-cl.exe
-configure:2814: result: no
-configure:2828: checking for cl.exe
-configure:2858: result: no
-configure:2882: error: in `/d/projects/omim/3party/fribidi':
-configure:2885: error: no acceptable C compiler found in $PATH
-See `config.log' for more details.
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_GLIB_CFLAGS_set=
-ac_cv_env_GLIB_CFLAGS_value=
-ac_cv_env_GLIB_LIBS_set=
-ac_cv_env_GLIB_LIBS_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_PKG_CONFIG_set=
-ac_cv_env_PKG_CONFIG_value=
-ac_cv_env_build_alias_set=set
-ac_cv_env_build_alias_value=install
-ac_cv_env_host_alias_set=set
-ac_cv_env_host_alias_value=install
-ac_cv_env_target_alias_set=set
-ac_cv_env_target_alias_value=install
-ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=gawk
-ac_cv_prog_make_make_set=no
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /d/projects/omim/3party/fribidi/missing --run aclocal-1.10'
-AMDEPBACKSLASH=''
-AMDEP_FALSE=''
-AMDEP_TRUE=''
-AMTAR='${SHELL} /d/projects/omim/3party/fribidi/missing --run tar'
-AR=''
-AS=''
-AUTOCONF='${SHELL} /d/projects/omim/3party/fribidi/missing --run autoconf'
-AUTOHEADER='${SHELL} /d/projects/omim/3party/fribidi/missing --run autoheader'
-AUTOMAKE='${SHELL} /d/projects/omim/3party/fribidi/missing --run automake-1.10'
-AWK='gawk'
-CC=''
-CCDEPMODE=''
-CFLAGS=''
-CPP=''
-CPPFLAGS=''
-CYGPATH_W='echo'
-DEFS=''
-DEPDIR=''
-DLLTOOL=''
-DSYMUTIL=''
-DUMPBIN=''
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP=''
-EXEEXT=''
-FGREP=''
-FRIBIDI_BINARY_AGE='3'
-FRIBIDI_CHARSETS=''
-FRIBIDI_CHARSETS_FALSE=''
-FRIBIDI_CHARSETS_TRUE=''
-FRIBIDI_INTERFACE_AGE='1'
-FRIBIDI_INTERFACE_VERSION='3'
-FRIBIDI_MAJOR_VERSION='0'
-FRIBIDI_MICRO_VERSION='2'
-FRIBIDI_MINOR_VERSION='19'
-FRIBIDI_NO_DEPRECATED=''
-FRIBIDI_USE_GLIB=''
-FRIBIDI_USE_GLIB_FALSE=''
-FRIBIDI_USE_GLIB_TRUE=''
-FRIBIDI_VERSION='0.19.2'
-GLIB_CFLAGS=''
-GLIB_LIBS=''
-GREP=''
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LD=''
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LIBTOOL=''
-LIPO=''
-LN_S=''
-LTLIBOBJS=''
-LT_CURRENT_MINUS_AGE='0'
-LT_VERSION_INFO='3:1:3'
-MAKEINFO='${SHELL} /d/projects/omim/3party/fribidi/missing --run makeinfo'
-MISC_CFLAGS=''
-MISC_LIBS=''
-MISC_PACKAGES=''
-MKDIR_P='/bin/mkdir -p'
-NM=''
-NMEDIT=''
-OBJDUMP=''
-OBJEXT=''
-OS_WIN32_FALSE=''
-OS_WIN32_TRUE=''
-OTOOL64=''
-OTOOL=''
-PACKAGE='fribidi'
-PACKAGE_BUGREPORT='http://fribidi.org/bug'
-PACKAGE_NAME='GNU FriBidi'
-PACKAGE_STRING='GNU FriBidi 0.19.2'
-PACKAGE_TARNAME='fribidi'
-PACKAGE_VERSION='0.19.2'
-PATH_SEPARATOR=':'
-PKG_CONFIG=''
-PLATFORM_WIN32_FALSE=''
-PLATFORM_WIN32_TRUE=''
-RANLIB=''
-SED=''
-SET_MAKE='MAKE=make'
-SHELL='/bin/sh'
-SIZEOF_INT=''
-STRIP=''
-VERSION='0.19.2'
-ac_ct_CC=''
-ac_ct_DUMPBIN=''
-am__fastdepCC_FALSE=''
-am__fastdepCC_TRUE=''
-am__include=''
-am__isrc=''
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-bindir='${exec_prefix}/bin'
-build='install'
-build_alias='install'
-build_cpu=''
-build_os=''
-build_vendor=''
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-dvidir='${docdir}'
-exec_prefix='NONE'
-host='install'
-host_alias='install'
-host_cpu=''
-host_os=''
-host_vendor=''
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${datarootdir}/info'
-install_sh='$(SHELL) /d/projects/omim/3party/fribidi/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}/var'
-lt_ECHO='echo'
-mandir='${datarootdir}/man'
-mkdir_p='/bin/mkdir -p'
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-prefix='NONE'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias='install'
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME "GNU FriBidi"
-#define PACKAGE_TARNAME "fribidi"
-#define PACKAGE_VERSION "0.19.2"
-#define PACKAGE_STRING "GNU FriBidi 0.19.2"
-#define PACKAGE_BUGREPORT "http://fribidi.org/bug"
-#define PACKAGE "fribidi"
-#define VERSION "0.19.2"
-
-configure: exit 1

3party/fribidi/lib/common.h

@@ -45,9 +45,9 @@
 # define FRIBIDI_PRIVATESPACE(SYMBOL) FRIBIDI_PRIVATESPACE0(_,FRIBIDI_NAMESPACE(_##SYMBOL##__internal__))
 #endif /* !FRIBIDI_PRIVATESPACE */
 
-//#if (defined(WIN32)) || (defined(_WIN32_WCE))
-//# define FRIBIDI_ENTRY __declspec(dllexport)
-//#endif /* WIN32 */
+#if (defined(WIN32)) || (defined(_WIN32_WCE))
+# define FRIBIDI_ENTRY __declspec(dllexport)
+#endif /* WIN32 */
 
 #if FRIBIDI_USE_GLIB+0
 # ifndef SIZEOF_LONG
@@ -121,13 +121,13 @@
 # endif	/* !fribidi_free */
 #endif /* fribidi_malloc */
 
-#if HAVE_STRING_H
+#if HAVE_STRING_H+0
 # if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#if HAVE_STRINGS_H+0
 # include <strings.h>
 #endif
 
@@ -167,11 +167,11 @@
 # define FRIBIDI_EMPTY_STMT FRIBIDI_BEGIN_STMT (void) 0; FRIBIDI_END_STMT
 #endif /* !FRIBIDI_EMPTY_STMT */
 
-//#if HAVE_STRINGIZE
+#if HAVE_STRINGIZE+0
 # define STRINGIZE(symbol) #symbol
-//#else /* !HAVE_STRINGIZE */
-//# define STRINGIZE(symbol) (no stringize operator available)
-//#endif /* !HAVE_STRINGIZE */
+#else /* !HAVE_STRINGIZE */
+# define STRINGIZE(symbol) (no stringize operator available)
+#endif /* !HAVE_STRINGIZE */
 
 /* As per recommendation of GNU Coding Standards. */
 #ifndef _GNU_SOURCE

3party/fribidi/lib/fribidi-arabic.c

@@ -33,7 +33,7 @@
 
 #include "common.h"
 
-#if HAVE_STDLIB_H
+#if HAVE_STDLIB_H+0
 # include <stdlib.h>
 #endif
 

3party/fribidi/lib/fribidi-common.h

@@ -53,11 +53,11 @@
 
 /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
 #ifndef FRIBIDI_ENTRY
-//# if (defined(WIN32)) || (defined(_WIN32_WCE))
-//#  define FRIBIDI_ENTRY __declspec(dllimport)
-//# else /* !WIN32 */
+# if (defined(WIN32)) || (defined(_WIN32_WCE))
+#  define FRIBIDI_ENTRY __declspec(dllimport)
+# else /* !WIN32 */
 #  define FRIBIDI_ENTRY		/* empty */
-//# endif	/* !WIN32 */
+# endif	/* !WIN32 */
 #endif /* !FRIBIDI_ENTRY */
 
 #if FRIBIDI_USE_GLIB+0

3party/fribidi/lib/fribidi-config.h

@@ -1,30 +0,0 @@
-/* @configure_input@ */
-/* Not copyrighted, in public domain. */
-#ifndef FRIBIDI_CONFIG_H
-#define FRIBIDI_CONFIG_H
-
-#define FRIBIDI "PACKAGE"
-#define FRIBIDI_NAME "PACKAGE_NAME"
-#define FRIBIDI_BUGREPORT "PACKAGE_BUGREPORT"
-
-#define FRIBIDI_VERSION "FRIBIDI_VERSION"
-#define FRIBIDI_MAJOR_VERSION 1
-#define FRIBIDI_MINOR_VERSION 0
-#define FRIBIDI_MICRO_VERSION 0
-#define FRIBIDI_INTERFACE_VERSION 1
-#define FRIBIDI_INTERFACE_VERSION_STRING "FRIBIDI_INTERFACE_VERSION"
-
-/* 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
-
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-
-#endif /* FRIBIDI_CONFIG_H */

3party/fribidi/lib/fribidi-config.h.in

@@ -0,0 +1,26 @@
+/* @configure_input@ */
+/* Not copyrighted, in public domain. */
+#ifndef FRIBIDI_CONFIG_H
+#define FRIBIDI_CONFIG_H
+
+#define FRIBIDI "@PACKAGE@"
+#define FRIBIDI_NAME "@PACKAGE_NAME@"
+#define FRIBIDI_BUGREPORT "@PACKAGE_BUGREPORT@"
+
+#define FRIBIDI_VERSION "@FRIBIDI_VERSION@"
+#define FRIBIDI_MAJOR_VERSION @FRIBIDI_MAJOR_VERSION@
+#define FRIBIDI_MINOR_VERSION @FRIBIDI_MINOR_VERSION@
+#define FRIBIDI_MICRO_VERSION @FRIBIDI_MICRO_VERSION@
+#define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@
+#define FRIBIDI_INTERFACE_VERSION_STRING "@FRIBIDI_INTERFACE_VERSION@"
+
+/* Define to 1 if you want charset conversion codes in the library */
+#define FRIBIDI_CHARSETS @FRIBIDI_CHARSETS@
+
+/* Define to 1 if you want to use glib */
+#define FRIBIDI_USE_GLIB @FRIBIDI_USE_GLIB@
+
+/* The size of a `int', as computed by sizeof. */
+#define FRIBIDI_SIZEOF_INT @SIZEOF_INT@
+
+#endif /* FRIBIDI_CONFIG_H */

3party/fribidi/lib/fribidi-deprecated.c

@@ -188,7 +188,7 @@ FRIBIDI_ENTRY FriBidiLevel
 fribidi_log2vis (
   /* input */
   const FriBidiChar *str,
-  const FriBidiStrIndex len,
+  FriBidiStrIndex len,
   /* input and output */
   FriBidiParType *pbase_dir,
   /* output */

3party/fribidi/lib/fribidi-mem.c

@@ -59,7 +59,7 @@ fribidi_mem_chunk_new (
 {
   register FriBidiMemChunk *m;
 
-  fribidi_assert (area_size >= (unsigned long)atom_size * 8);
+  fribidi_assert (area_size >= atom_size * 8);
 
   m = (FriBidiMemChunk *) fribidi_malloc (sizeof (FriBidiMemChunk));
   if LIKELY

3party/fribidi/lib/fribidi-types.h

@@ -82,22 +82,21 @@
 #  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 <stdlib.h>
-//#    include <stddef.h>
-//#   else /* !STDC_HEADERS */
-//#    if HAVE_STDLIB_H
-//#     include <stdlib.h>
-//#    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 */
-#define FRIBIDI_UNICHAR_LOCAL		wchar_t
+# if SIZEOF_WCHAR_T >= 4
+#  ifndef __FRIBIDI_DOC
+#   if STDC_HEADERS
+#    include <stdlib.h>
+#    include <stddef.h>
+#   else /* !STDC_HEADERS */
+#    if HAVE_STDLIB_H
+#     include <stdlib.h>
+#    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 */
 #endif /* !FRIBIDI_USE_GLIB */
 
 #if FRIBIDI_INT_TYPES+0