Index: fofi/FoFiTrueType.cc
===================================================================
RCS file: /cvs/poppler/poppler/fofi/FoFiTrueType.cc,v
retrieving revision 1.5
diff -u -r1.5 FoFiTrueType.cc
--- fofi/FoFiTrueType.cc	2 Feb 2006 22:50:01 -0000	1.5
+++ fofi/FoFiTrueType.cc	3 Jun 2006 21:25:23 -0000
@@ -1565,7 +1565,6 @@
     return;
   if (head == toTag('t','t','c','f')) {
     /* TTC font */
-    unsigned int tableDir;
     int dircount;
 
     dircount = getU32BE(8, &parsedOk);
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	3 Jun 2006 21:25:23 -0000
@@ -18,6 +18,7 @@
 #include "GlobalParams.h"
 #include "Error.h"
 
+#ifndef WIN32
 static void CDECL defaultErrorFunction(int pos, char *msg, va_list args)
 {
   if (pos >= 0) {
@@ -30,7 +31,7 @@
   fflush(stderr);
 }
 
-static void CDECL (*errorFunction)(int , char *, va_list args) = defaultErrorFunction;
+static void CDECL (*errorFunction)(int , char *, va_list) = defaultErrorFunction;
 
 void setErrorFunction(void CDECL (* f)(int , char *, va_list args))
 {
@@ -47,3 +48,4 @@
   (*errorFunction)(pos, msg, args);
   va_end(args);
 }
+#endif
Index: poppler/GfxFont.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GfxFont.cc,v
retrieving revision 1.9
diff -u -r1.9 GfxFont.cc
--- poppler/GfxFont.cc	2 May 2006 04:38:39 -0000	1.9
+++ poppler/GfxFont.cc	3 Jun 2006 21:25:24 -0000
@@ -1537,11 +1537,9 @@
 Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) {
   Gushort *map;
   int cmapPlatform, cmapEncoding;
-  int unicodeCmap, macRomanCmap, msSymbolCmap, cmap;
-  GBool useMacRoman, useUnicode;
-  char *charName;
+  int cmap;
   Unicode u;
-  int code, i;
+  int i;
   int mapsize;
   int cidlen;
 
Index: poppler/GfxState.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GfxState.cc,v
retrieving revision 1.12
diff -u -r1.12 GfxState.cc
--- poppler/GfxState.cc	13 May 2006 16:01:57 -0000	1.12
+++ poppler/GfxState.cc	3 Jun 2006 21:25:26 -0000
@@ -1119,7 +1119,6 @@
 }
 
 void GfxIndexedColorSpace::getRGBLine(Guchar *in, unsigned int *out, int length) {
-  GfxColor color2;
   Guchar *line;
   int i, j, n;
 
@@ -3453,11 +3452,8 @@
 }
 
 void GfxImageColorMap::getGrayLine(Guchar *in, Guchar *out, int length) {
-  GfxColor color;
-  double *p;
   int i, j;
-  Guchar *inp, *outp, *tmp_line;
-  GfxColorSpace *base;
+  Guchar *inp, *tmp_line;
 
   switch (colorSpace->getMode()) {
   case csIndexed:
@@ -3486,11 +3482,8 @@
 }
 
 void GfxImageColorMap::getRGBLine(Guchar *in, unsigned int *out, int length) {
-  GfxColor color;
-  double *p;
   int i, j;
-  Guchar *inp, *outp, *tmp_line;
-  GfxColorSpace *base;
+  Guchar *inp, *tmp_line;
 
   switch (colorSpace->getMode()) {
   case csIndexed:
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	3 Jun 2006 21:25:27 -0000
@@ -23,7 +23,9 @@
 #ifdef WIN32
 #  include <shlobj.h>
 #endif
-#include <fontconfig/fontconfig.h>
+#ifndef WIN32
+#  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;
-  
+
+#ifndef WIN32
   FcInit();
   FCcfg = FcConfigGetCurrent();
+#endif
 
 #if MULTITHREADED
   gInitMutex(&mutex);
@@ -1103,6 +1107,7 @@
   }
 }
 
+#ifndef WIN32
 static FcPattern *buildFcPattern(GfxFont *font)
 {
   int weight = FC_WEIGHT_NORMAL,
@@ -1244,7 +1249,13 @@
     delete[] family;
   return p;
 }
+#endif
 
+#ifdef WIN32
+DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
+    return NULL;
+}
+#else
 DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
   DisplayFontParam *dfp;
   FcPattern *p=0;
@@ -1303,6 +1314,7 @@
   unlockGlobalParams;
   return dfp;
 }
+#endif
 
 GooString *GlobalParams::getPSFile() {
   GooString *s;
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	3 Jun 2006 21:25:27 -0000
@@ -15,7 +15,9 @@
 
 #include "poppler-config.h"
 #include <stdio.h>
+#ifndef WIN32
 #include <fontconfig/fontconfig.h>
+#endif
 #include "goo/gtypes.h"
 #include "CharTypes.h"
 
@@ -314,8 +316,10 @@
   CharCodeToUnicodeCache *unicodeToUnicodeCache;
   UnicodeMapCache *unicodeMapCache;
   CMapCache *cMapCache;
-  
+
+#ifndef WIN32
   FcConfig *FCcfg;
+#endif
 
 #ifdef ENABLE_PLUGINS
   GList *plugins;		// list of plugins [Plugin]
Index: poppler/Page.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Page.cc,v
retrieving revision 1.12
diff -u -r1.12 Page.cc
--- poppler/Page.cc	16 Mar 2006 22:04:56 -0000	1.12
+++ poppler/Page.cc	3 Jun 2006 21:25:28 -0000
@@ -233,7 +233,6 @@
   
   return;
 
- err3:
   trans.initNull();
  err2:
   annots.initNull();
Index: poppler/PageLabelInfo.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/PageLabelInfo.h,v
retrieving revision 1.5
diff -u -r1.5 PageLabelInfo.h
--- poppler/PageLabelInfo.h	1 May 2006 13:41:14 -0000	1.5
+++ poppler/PageLabelInfo.h	3 Jun 2006 21:25:28 -0000
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <assert.h>
-
+#include <config.h> /* for snprintf() for WIN32 */
 #include <goo/gtypes.h>
 #include <goo/GooList.h>
 #include <goo/GooString.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	3 Jun 2006 21:25:28 -0000
@@ -35,7 +35,9 @@
 SecurityHandler *SecurityHandler::make(PDFDoc *docA, Object *encryptDictA) {
   Object filterObj;
   SecurityHandler *secHdlr;
+#ifdef ENABLE_PLUGINS
   XpdfSecurityHandler *xsh;
+#endif
 
   encryptDictA->dictLookup("Filter", &filterObj);
   if (filterObj.isName("Standard")) {
Index: poppler/SplashOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/SplashOutputDev.cc,v
retrieving revision 1.9
diff -u -r1.9 SplashOutputDev.cc
--- poppler/SplashOutputDev.cc	31 May 2006 20:14:04 -0000	1.9
+++ poppler/SplashOutputDev.cc	3 Jun 2006 21:25:29 -0000
@@ -951,17 +951,16 @@
   FoFiTrueType *ff;
   Ref embRef;
   Object refObj, strObj;
-  GooString *fileName, *substName;
+  GooString *fileName;
   char *tmpBuf;
   int tmpBufLen;
   Gushort *codeToGID;
   DisplayFontParam *dfp;
   CharCodeToUnicode *ctu;
-  double m11, m12, m21, m22, w1, w2;
+  double m11, m12, m21, m22;
   SplashCoord mat[4];
-  char *name;
   Unicode uBuf[8];
-  int c, substIdx, n, code, cmap;
+  int substIdx, n, code, cmap;
   int faceIndex = 0;
 
   needFontUpdate = gFalse;
Index: poppler/TextOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.cc,v
retrieving revision 1.20
diff -u -r1.20 TextOutputDev.cc
--- poppler/TextOutputDev.cc	19 May 2006 22:04:17 -0000	1.20
+++ poppler/TextOutputDev.cc	3 Jun 2006 21:25:31 -0000
@@ -3252,7 +3252,6 @@
 {
   PDFRectangle *rect;
   double x1, y1, x2, y2, margin;
-  int i;
 
   margin = (line->yMax - line->yMin) / 8;
   x1 = line->edge[edge_begin];
@@ -3334,7 +3333,6 @@
 				      PDFRectangle *selection)
 {
   double x1, y1, x2, y2, margin;
-  int i;
   Matrix ctm, ictm;
 
   state->setFillColor(box_color);
@@ -3620,7 +3618,6 @@
 GooList *TextPage::getSelectionRegion(PDFRectangle *selection,
 				      double scale) {
   TextSelectionSizer sizer(this, scale);
-  GooList *region;
 
   visitSelection(&sizer, selection);
 
Index: splash/SplashFTFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFTFontEngine.cc,v
retrieving revision 1.4
diff -u -r1.4 SplashFTFontEngine.cc
--- splash/SplashFTFontEngine.cc	2 Feb 2006 22:50:01 -0000	1.4
+++ splash/SplashFTFontEngine.cc	3 Jun 2006 21:25:31 -0000
@@ -13,7 +13,9 @@
 #endif
 
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include "goo/gmem.h"
 #include "goo/GooString.h"
 #include "goo/gfile.h"
Index: splash/SplashFontFile.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontFile.cc,v
retrieving revision 1.3
diff -u -r1.3 SplashFontFile.cc
--- splash/SplashFontFile.cc	2 Feb 2006 22:50:01 -0000	1.3
+++ splash/SplashFontFile.cc	3 Jun 2006 21:25:31 -0000
@@ -11,7 +11,9 @@
 #endif
 
 #include <stdio.h>
+#ifndef WIN32
 #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.2
diff -u -r1.2 SplashFontFile.h
--- splash/SplashFontFile.h	2 Feb 2006 22:50:01 -0000	1.2
+++ splash/SplashFontFile.h	3 Jun 2006 21:25:31 -0000
@@ -23,7 +23,8 @@
 // SplashFontFile
 //------------------------------------------------------------------------
 
-struct SplashFontSrc {
+class SplashFontSrc {
+public:
   SplashFontSrc();
   ~SplashFontSrc();