Attachment 5801 Details for Bug 7107 – alternative patch for VC7/8 and Windows support

[patch] alternative patch for VC7/8 and Windows support

msvc.diff (text/plain), 6.80 KB, created by Reece Dunn on 2006-06-03 17:45:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Reece Dunn

Created: 2006-06-03 17:45:31 UTC

Size: 6.80 KB

patch

obsolete

>Index: poppler/Error.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/Error.cc,v
>retrieving revision 1.2
>diff -u -r1.2 Error.cc
>--- poppler/Error.cc	2 Jun 2005 00:35:44 -0000	1.2
>+++ poppler/Error.cc	2 Jun 2006 23:22:06 -0000
>@@ -18,7 +18,7 @@
> #include "GlobalParams.h"
> #include "Error.h"
> 
>-static void CDECL defaultErrorFunction(int pos, char *msg, va_list args)
>+static void defaultErrorFunction(int pos, char *msg, va_list args)
> {
>   if (pos >= 0) {
>     fprintf(stderr, "Error (%d): ", pos);
>@@ -30,9 +30,9 @@
>   fflush(stderr);
> }
> 
>-static void CDECL (*errorFunction)(int , char *, va_list args) = defaultErrorFunction;
>+static void (*errorFunction)(int , char *, va_list args) = defaultErrorFunction;
> 
>-void setErrorFunction(void CDECL (* f)(int , char *, va_list args))
>+void setErrorFunction(void (* f)(int , char *, va_list args))
> {
>     errorFunction = f;
> }
>Index: poppler/GlobalParams.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/GlobalParams.cc,v
>retrieving revision 1.17
>diff -u -r1.17 GlobalParams.cc
>--- poppler/GlobalParams.cc	4 Feb 2006 20:48:25 -0000	1.17
>+++ poppler/GlobalParams.cc	2 Jun 2006 23:22:08 -0000
>@@ -23,7 +23,9 @@
> #ifdef WIN32
> #  include <shlobj.h>
> #endif
>-#include <fontconfig/fontconfig.h>
>+#ifdef HAVE_FONTCONFIG_H
>+#  include <fontconfig/fontconfig.h>
>+#endif
> #include "goo/gmem.h"
> #include "goo/GooString.h"
> #include "goo/GooList.h"
>@@ -286,9 +288,11 @@
>   GooString *fileName;
>   FILE *f;
>   int i;
>-  
>+
>+#ifdef HAVE_FONTCONFIG_H
>   FcInit();
>   FCcfg = FcConfigGetCurrent();
>+#endif
> 
> #if MULTITHREADED
>   gInitMutex(&mutex);
>@@ -1103,6 +1107,7 @@
>   }
> }
> 
>+#ifdef HAVE_FONTCONFIG_H
> static FcPattern *buildFcPattern(GfxFont *font)
> {
>   int weight = FC_WEIGHT_NORMAL,
>@@ -1244,8 +1249,10 @@
>     delete[] family;
>   return p;
> }
>+#endif
> 
> DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
>+#ifdef HAVE_FONTCONFIG_H
>   DisplayFontParam *dfp;
>   FcPattern *p=0;
> 
>@@ -1302,6 +1309,9 @@
> 
>   unlockGlobalParams;
>   return dfp;
>+#else
>+  return 0;
>+#endif
> }
> 
> GooString *GlobalParams::getPSFile() {
>Index: poppler/GlobalParams.h
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/GlobalParams.h,v
>retrieving revision 1.6
>diff -u -r1.6 GlobalParams.h
>--- poppler/GlobalParams.h	2 Feb 2006 22:50:01 -0000	1.6
>+++ poppler/GlobalParams.h	2 Jun 2006 23:22:08 -0000
>@@ -15,7 +15,9 @@
> 
> #include "poppler-config.h"
> #include <stdio.h>
>-#include <fontconfig/fontconfig.h>
>+#ifdef HAVE_FONTCONFIG_H
>+#  include <fontconfig/fontconfig.h>
>+#endif
> #include "goo/gtypes.h"
> #include "CharTypes.h"
> 
>@@ -314,8 +316,10 @@
>   CharCodeToUnicodeCache *unicodeToUnicodeCache;
>   UnicodeMapCache *unicodeMapCache;
>   CMapCache *cMapCache;
>-  
>+
>+#ifdef HAVE_FONTCONFIG_H
>   FcConfig *FCcfg;
>+#endif
> 
> #ifdef ENABLE_PLUGINS
>   GList *plugins;		// list of plugins [Plugin]
>Index: poppler/PageLabelInfo.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/PageLabelInfo.cc,v
>retrieving revision 1.6
>diff -u -r1.6 PageLabelInfo.cc
>--- poppler/PageLabelInfo.cc	1 May 2006 13:41:14 -0000	1.6
>+++ poppler/PageLabelInfo.cc	2 Jun 2006 23:22:08 -0000
>@@ -3,6 +3,7 @@
> #include <stdio.h>
> #include <assert.h>
> #include "UGooString.h"
>+#include "poppler-config.h"
> 
> #include "PageLabelInfo.h"
> 
>Index: poppler/SecurityHandler.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/SecurityHandler.cc,v
>retrieving revision 1.2
>diff -u -r1.2 SecurityHandler.cc
>--- poppler/SecurityHandler.cc	18 Jan 2006 22:32:13 -0000	1.2
>+++ poppler/SecurityHandler.cc	2 Jun 2006 23:22:09 -0000
>@@ -12,7 +12,7 @@
> #pragma implementation
> #endif
> 
>-#include "GooString.h"
>+#include "goo/GooString.h"
> #include "PDFDoc.h"
> #include "Decrypt.h"
> #include "Error.h"
>Index: poppler/SecurityHandler.h
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/SecurityHandler.h,v
>retrieving revision 1.1
>diff -u -r1.1 SecurityHandler.h
>--- poppler/SecurityHandler.h	16 Sep 2005 18:29:18 -0000	1.1
>+++ poppler/SecurityHandler.h	2 Jun 2006 23:22:09 -0000
>@@ -15,7 +15,7 @@
> #pragma interface
> #endif
> 
>-#include "gtypes.h"
>+#include "goo/gtypes.h"
> #include "Object.h"
> 
> class GooString;
>Index: poppler/poppler-config.h.in
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/poppler-config.h.in,v
>retrieving revision 1.5
>diff -u -r1.5 poppler-config.h.in
>--- poppler/poppler-config.h.in	23 Jan 2006 18:52:48 -0000	1.5
>+++ poppler/poppler-config.h.in	2 Jun 2006 23:22:09 -0000
>@@ -1,3 +1,4 @@
>+/* poppler/poppler-config.h.  Generated by configure.  */
> //================================================= -*- mode: c++ -*- ====
> //
> // poppler-config.h
>@@ -14,28 +15,35 @@
> // around #undef look odd, but it's to silence warnings about
> // redefining those symbols.
> 
>+/* Use A4 paper size instead of Letter for PostScript output. */
>+#ifndef A4_PAPER
>+#undef A4_PAPER
>+#endif
>+
> /* Enable multithreading support. */
> #ifndef MULTITHREADING
>-#undef MULTITHREADED
>+#define MULTITHREADED 1
> #endif
> 
> /* Full path for the system-wide xpdfrc file. */
> #ifndef SYSTEM_XPDFRC
>-#undef SYSTEM_XPDFRC
>+#define SYSTEM_XPDFRC "/usr/etc/xpdfrc"
> #endif
> 
> /* Include support for OPI comments. */
> #ifndef OPI_SUPPORT
>-#undef OPI_SUPPORT
>+#define OPI_SUPPORT 1
> #endif
> 
> /* Enable word list support. */
> #ifndef TEXTOUT_WORD_LIST
>-#undef TEXTOUT_WORD_LIST
>+#define TEXTOUT_WORD_LIST 1
> #endif
> 
> // Also, there's a couple of preprocessor symbols in the header files
> // that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and
>+// NO_DECRYPTION.  We might want to explicitly #undef these to make
>+// sure we don't get spurious API or ABI incompatibilities.
> 
> //------------------------------------------------------------------------
> // version
>@@ -126,8 +134,8 @@
> //------------------------------------------------------------------------
> 
> #ifdef CDECL
>-#undef CDECL
>-#endif
>+/* #undef CDECL */
>+#else
> 
> #if defined(_MSC_VER) || defined(__BORLANDC__)
> #define CDECL __cdecl
>@@ -135,6 +143,8 @@
> #define CDECL
> #endif
> 
>+#endif
>+
> //------------------------------------------------------------------------
> // Compiler
> //------------------------------------------------------------------------
>@@ -146,5 +156,10 @@
> #define GCC_PRINTF_FORMAT(fmt_index, va_index)
> #endif
> 
>+#if defined(_MSC_VER)
>+#define snprintf    _snprintf
>+#define strncasecmp strnicmp
>+#endif
>+
> 
> #endif /* POPPLER_CONFIG_H */

Actions: View | Splinter Review

Attachments on bug 7107: 5799 | 5801 | 7314 | 34268 | 36628 | 36629 | 36682 | 36683 | 36684 | 36685 | 36686 | 36725 | 36726 | 36727

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.