[poppler] Branch 'poppler-0.20' - poppler/strtok_r.cpp

[Albert Astals Cid]

 poppler/strtok_r.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9f51baaf7a86680f2195ecdb978f1eb59a8aa734
Author: Albert Astals Cid <aacid at kde.org>
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 <alexpux at gmail.com>
+// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
 //
 // 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