? config-unix.h
? dbg
? ext
? make.txt
? makefile.vc
? msvc
? msvc.patch
? out.patch
? rel
? glib/demo/.deps
? glib/demo/Makefile
? glib/demo/Makefile.in
? poppler/GlobalParamsWin.cc
? test/perf-test.cc
Index: poppler/DCTStream.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/DCTStream.h,v
retrieving revision 1.8
diff -u -r1.8 DCTStream.h
--- poppler/DCTStream.h	15 Jul 2007 17:09:29 -0000	1.8
+++ poppler/DCTStream.h	11 Sep 2007 04:52:42 -0000
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
Index: poppler/Error.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Error.cc,v
retrieving revision 1.3
diff -u -r1.3 Error.cc
--- poppler/Error.cc	2 Sep 2007 00:53:42 -0000	1.3
+++ poppler/Error.cc	11 Sep 2007 04:52:42 -0000
@@ -30,12 +30,14 @@
   fflush(stderr);
 }
 
+#ifndef _MSC_VER
 static void CDECL (*errorFunction)(int , char *, va_list args) = defaultErrorFunction;
 
 void setErrorFunction(void CDECL (* f)(int , char *, va_list args))
 {
     errorFunction = f;
 }
+#endif
 
 void CDECL error(int pos, char *msg, ...) {
   va_list args;
@@ -44,7 +46,11 @@
     return;
   }
   va_start(args, msg);
+#ifdef _MSC_VER
+  defaultErrorFunction(pos, msg, args);
+#else
   (*errorFunction)(pos, msg, args);
+#endif
   va_end(args);
 }
 
Index: poppler/FlateStream.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/FlateStream.h,v
retrieving revision 1.3
diff -u -r1.3 FlateStream.h
--- poppler/FlateStream.h	6 Sep 2006 23:54:30 -0000	1.3
+++ poppler/FlateStream.h	11 Sep 2007 04:52:42 -0000
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
Index: poppler/GlobalParams.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GlobalParams.cc,v
retrieving revision 1.26
diff -u -r1.26 GlobalParams.cc
--- poppler/GlobalParams.cc	22 Aug 2007 19:34:02 -0000	1.26
+++ poppler/GlobalParams.cc	11 Sep 2007 04:52:42 -0000
@@ -23,7 +23,6 @@
 #ifdef WIN32
 #  include <shlobj.h>
 #endif
-#include <fontconfig/fontconfig.h>
 #include "goo/gmem.h"
 #include "goo/GooString.h"
 #include "goo/GooList.h"
@@ -533,9 +532,11 @@
 GlobalParams::GlobalParams() {
   UnicodeMap *map;
   int i;
-  
+
+#ifndef _MSC_VER  
   FcInit();
   FCcfg = FcConfigGetCurrent();
+#endif
 
 #if MULTITHREADED
   gInitMutex(&mutex);
@@ -924,6 +925,7 @@
   }
 }
 
+#ifndef _MSC_VER
 static FcPattern *buildFcPattern(GfxFont *font)
 {
   int weight = FC_WEIGHT_NORMAL,
@@ -1065,7 +1067,12 @@
     delete[] family;
   return p;
 }
+#endif
 
+/* if you can't or don't want to use Fontconfig, you need to implement
+   this function for your platform. For Windows, it's in GlobalParamsWin.cc
+*/
+#ifndef _MSC_VER
 DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
   DisplayFontParam *dfp;
   FcPattern *p=0;
@@ -1124,6 +1131,7 @@
   unlockGlobalParams;
   return dfp;
 }
+#endif
 
 GBool GlobalParams::getPSExpandSmaller() {
   GBool f;
Index: poppler/GlobalParams.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GlobalParams.h,v
retrieving revision 1.10
diff -u -r1.10 GlobalParams.h
--- poppler/GlobalParams.h	11 Jun 2007 21:14:22 -0000	1.10
+++ poppler/GlobalParams.h	11 Sep 2007 04:52:42 -0000
@@ -13,9 +13,12 @@
 #pragma interface
 #endif
 
+#include <assert.h>
 #include "poppler-config.h"
 #include <stdio.h>
+#ifndef _MSC_VER
 #include <fontconfig/fontconfig.h>
+#endif
 #include "goo/gtypes.h"
 #include "CharTypes.h"
 
@@ -74,6 +77,14 @@
   };
 
   DisplayFontParam(GooString *nameA, DisplayFontParamKind kindA);
+  void setFileName(GooString *fileNameA) {
+    if (displayFontT1 == kind)
+        t1.fileName = fileNameA;
+    else {
+        assert(displayFontTT == kind);
+        tt.fileName = fileNameA;
+    }
+  }  
   virtual ~DisplayFontParam();
 };
 
@@ -136,6 +147,10 @@
 
   void setBaseDir(char *dir);
 
+#ifdef _MSC_VER
+  void setupBaseFonts(char *dir);
+#endif
+
   //----- accessors
 
   CharCode getMacRomanCharCode(char *charName);
@@ -302,7 +317,9 @@
   UnicodeMapCache *unicodeMapCache;
   CMapCache *cMapCache;
   
+#ifndef _MSC_VER
   FcConfig *FCcfg;
+#endif
 
 #ifdef ENABLE_PLUGINS
   GList *plugins;		// list of plugins [Plugin]
Index: poppler/Stream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Stream.cc,v
retrieving revision 1.19
diff -u -r1.19 Stream.cc
--- poppler/Stream.cc	3 Sep 2007 17:09:02 -0000	1.19
+++ poppler/Stream.cc	11 Sep 2007 04:52:43 -0000
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <limits.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
Index: splash/SplashFTFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFTFontEngine.cc,v
retrieving revision 1.5
diff -u -r1.5 SplashFTFontEngine.cc
--- splash/SplashFTFontEngine.cc	25 Apr 2007 19:59:10 -0000	1.5
+++ splash/SplashFTFontEngine.cc	11 Sep 2007 04:52:43 -0000
@@ -13,7 +13,9 @@
 #endif
 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include "goo/gmem.h"
 #include "goo/GooString.h"
 #include "goo/gfile.h"
Index: splash/SplashFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontEngine.cc,v
retrieving revision 1.6
diff -u -r1.6 SplashFontEngine.cc
--- splash/SplashFontEngine.cc	11 Jul 2007 18:12:27 -0000	1.6
+++ splash/SplashFontEngine.cc	11 Sep 2007 04:52:44 -0000
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 #include "goo/gmem.h"
Index: splash/SplashFontFile.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontFile.cc,v
retrieving revision 1.4
diff -u -r1.4 SplashFontFile.cc
--- splash/SplashFontFile.cc	25 Apr 2007 19:59:10 -0000	1.4
+++ splash/SplashFontFile.cc	11 Sep 2007 04:52:44 -0000
@@ -11,7 +11,9 @@
 #endif
 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include "goo/gmem.h"
 #include "goo/GooString.h"
 #include "SplashFontFile.h"
Index: splash/SplashFontFile.h
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontFile.h,v
retrieving revision 1.3
diff -u -r1.3 SplashFontFile.h
--- splash/SplashFontFile.h	25 Apr 2007 19:59:10 -0000	1.3
+++ splash/SplashFontFile.h	11 Sep 2007 04:52:44 -0000
@@ -23,7 +23,8 @@
 // SplashFontFile
 //------------------------------------------------------------------------
 
-struct SplashFontSrc {
+class SplashFontSrc {
+public:
   SplashFontSrc();
   ~SplashFontSrc();
 
Index: splash/SplashT1FontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashT1FontEngine.cc,v
retrieving revision 1.4
diff -u -r1.4 SplashT1FontEngine.cc
--- splash/SplashT1FontEngine.cc	11 Jul 2007 18:12:27 -0000	1.4
+++ splash/SplashT1FontEngine.cc	11 Sep 2007 04:52:44 -0000
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 #include <t1lib.h>