[patch] diff between libguess 1.1 and 1.2

libguess-1.2-upg.patch (text/plain), 2.36 KB, created by Rafał Mużyło on 2014-04-27 01:42:48 UTC

diff -dupr libguess-1.1/configure.ac libguess-1.2/configure.ac
--- libguess-1.1/configure.ac	2011-12-01 14:07:11.000000000 +0100
+++ libguess-1.2/configure.ac	2013-11-28 00:05:31.000000000 +0100
@@ -2,9 +2,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([libguess], [1.1], [[e-mail]])
+AC_INIT([libguess], [1.2], [[e-mail]])
 AC_CONFIG_SRCDIR([src/libguess/guess.c])
 AC_CONFIG_HEADER([src/libguess/autoconf.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -40,7 +41,7 @@ AC_CHECK_FUNCS([memset setlocale strcase
 AC_CHECK_FUNCS([printf sprintf snprintf vsnprintf gettimeofday strndup strlcpy strlcat])
 AC_FUNC_STAT
 
-PKG_CHECK_MODULES([MOWGLI], [libmowgli >= 0.9.50], [], [AC_MSG_ERROR([Install Mowgli from http://atheme.org/project/mowgli.])])
+PKG_CHECK_MODULES([MOWGLI], [libmowgli-2 >= 2.0.0], [], [AC_MSG_ERROR([Install Mowgli from http://atheme.org/project/mowgli.])])
 
 # Check for optional features.
 EXAMPLES_BUILD=""
diff -dupr libguess-1.1/src/libguess/guess.c libguess-1.2/src/libguess/guess.c
--- libguess-1.1/src/libguess/guess.c	2011-12-01 14:07:11.000000000 +0100
+++ libguess-1.2/src/libguess/guess.c	2013-11-28 00:05:31.000000000 +0100
@@ -19,11 +19,9 @@ guess_impl_register(const char *lang, gu
     mowgli_patricia_add(guess_impl_list, lang, impl);
 }
 
-static void
-guess_init(void)
+void
+libguess_init(void)
 {
-    mowgli_init();
-
     /* check if already initialized */
     if (guess_impl_list != NULL)
         return;
@@ -48,7 +46,7 @@ libguess_determine_encoding(const char *
 {
     guess_impl_f impl;
 
-    guess_init();
+    libguess_init();
 
     impl = mowgli_patricia_retrieve(guess_impl_list, lang);
     if (impl != NULL)
diff -dupr libguess-1.1/src/libguess/libguess.h libguess-1.2/src/libguess/libguess.h
--- libguess-1.1/src/libguess/libguess.h	2011-12-01 14:07:11.000000000 +0100
+++ libguess-1.2/src/libguess/libguess.h	2013-11-28 00:05:31.000000000 +0100
@@ -82,4 +82,9 @@ typedef void (*libguess_result_f)(const
 
 const char *libguess_determine_encoding(const char *buf, int buflen, const char *langset);
 
+/* In a multi-threaded application, libguess must be initialized before use in
+ * order to prevent race conditions.  In a single-threaded application, calling
+ * libguess_init() explicitly is not necessary. */
+void libguess_init(void);
+
 #endif