From 34a2f4605a88d8cb31184faceea16fad708a3d55 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <tsdgeos@terra.es>
Date: Thu, 29 Sep 2011 12:48:02 +0200
Subject: [PATCH] Apply and update 04-gcc-specify-printf-format.diff

---
 .../patches/04-gcc-specify-printf-format.diff | 20 ++++++++++---------
 .../poppler/synctex/synctex_parser_utils.h    | 10 ++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/generators/poppler/synctex/patches/04-gcc-specify-printf-format.diff b/generators/poppler/synctex/patches/04-gcc-specify-printf-format.diff
index f4bd393bd..7b2d7960a 100644
--- a/generators/poppler/synctex/patches/04-gcc-specify-printf-format.diff
+++ b/generators/poppler/synctex/patches/04-gcc-specify-printf-format.diff
@@ -1,21 +1,23 @@
-Index: synctex/synctex_parser_utils.h
-===================================================================
---- synctex.orig/synctex_parser_utils.h	2010-05-23 19:07:34.000000000 +0200
-+++ synctex/synctex_parser_utils.h	2010-05-23 19:08:00.000000000 +0200
-@@ -61,6 +61,12 @@
- #		define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
+diff --git a/generators/poppler/synctex/synctex_parser_utils.h b/generators/poppler/synctex/synctex_parser_utils.h
+index f0709e9..92184b8 100644
+--- a/generators/poppler/synctex/synctex_parser_utils.h
++++ b/generators/poppler/synctex/synctex_parser_utils.h
+@@ -72,7 +72,13 @@ extern "C" {
+ #	else
+ #		define SYNCTEX_IS_DOT(c) ('.' == c)
  #	endif
- 
+-    
++
 +#	ifdef __GNUC__
 +#		define SYNCTEX_PRINTF_FORMAT(si, ftc) __attribute__ ((format (printf, si, ftc)))
 +#	else
 +#		define SYNCTEX_PRINTF_FORMAT(si, ftc)
 +#	endif
-+
++ 
  /*  This custom malloc functions initializes to 0 the newly allocated memory.
   *  There is no bzero function on windows. */
  void *_synctex_malloc(size_t size);
-@@ -68,7 +74,7 @@
+@@ -80,7 +86,7 @@ void *_synctex_malloc(size_t size);
  /*  This is used to log some informational message to the standard error stream.
   *  On Windows, the stderr stream is not exposed and another method is used.
   *	The return value is the number of characters printed.	*/
diff --git a/generators/poppler/synctex/synctex_parser_utils.h b/generators/poppler/synctex/synctex_parser_utils.h
index f0709e9c6..92184b8dd 100644
--- a/generators/poppler/synctex/synctex_parser_utils.h
+++ b/generators/poppler/synctex/synctex_parser_utils.h
@@ -72,7 +72,13 @@ extern "C" {
 #	else
 #		define SYNCTEX_IS_DOT(c) ('.' == c)
 #	endif
-    
+
+#	ifdef __GNUC__
+#		define SYNCTEX_PRINTF_FORMAT(si, ftc) __attribute__ ((format (printf, si, ftc)))
+#	else
+#		define SYNCTEX_PRINTF_FORMAT(si, ftc)
+#	endif
+ 
 /*  This custom malloc functions initializes to 0 the newly allocated memory.
  *  There is no bzero function on windows. */
 void *_synctex_malloc(size_t size);
@@ -80,7 +86,7 @@ void *_synctex_malloc(size_t size);
 /*  This is used to log some informational message to the standard error stream.
  *  On Windows, the stderr stream is not exposed and another method is used.
  *	The return value is the number of characters printed.	*/
-int _synctex_error(const char * reason,...);
+int _synctex_error(const char * reason,...) SYNCTEX_PRINTF_FORMAT(1, 2);
 
 /*  strip the last extension of the given string, this string is modified!
  *  This function depends on the OS because the path separator may differ.