poppler/strtok_r.cpp | 3 ++- qt4/tests/Makefile.am | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit e8b6d2ac3a874dd5de166b52625fa628004ea5fe Merge: 7cb4072... 9f51baa... Author: Albert Astals Cid <[email protected]> Date: Sun Sep 16 14:08:34 2012 +0200 Merge remote-tracking branch 'origin/poppler-0.20' commit 9f51baaf7a86680f2195ecdb978f1eb59a8aa734 Author: Albert Astals Cid <[email protected]> Date: Sun Sep 16 14:07:45 2012 +0200 Rework the #ifdef so that i don't get a gcc warning diff --git a/poppler/strtok_r.cpp b/poppler/strtok_r.cpp index dc35e00..6483e0f 100644 --- a/poppler/strtok_r.cpp +++ b/poppler/strtok_r.cpp @@ -48,13 +48,14 @@ // under GPL version 2 or later // // Copyright (C) 2012 Alexey Pavlov <[email protected]> +// Copyright (C) 2012 Albert Astals Cid <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git // //======================================================================== -#ifdef __MINGW32__ && !defined(__WINPTHREADS_VERSION) +#if defined(__MINGW32__) && !defined(__WINPTHREADS_VERSION) #include <string.h> #define __rawmemchr strchr commit b63049f97629a93ec346033e0ec56fc11f34c4fe Author: Albert Astals Cid <[email protected]> Date: Sun Sep 16 14:05:01 2012 +0200 Forgot to add the new test to autotools diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am index be8ea35..6286d8c 100644 --- a/qt4/tests/Makefile.am +++ b/qt4/tests/Makefile.am @@ -79,7 +79,8 @@ TESTS = \ check_password \ check_pagelayout \ check_search \ - check_strings + check_strings \ + check_lexer check_PROGRAMS = $(TESTS) @@ -135,5 +136,9 @@ check_strings_SOURCES = check_strings.cpp check_strings.$(OBJEXT): check_strings.moc check_strings_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS) +check_lexer_SOURCES = check_lexer.cpp +check_lexer.$(OBJEXT): check_lexer.moc +check_lexer_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS) + endif _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
