diff -rubBN poppler-0.6.3.orig/fofi/FoFiEncodings.h poppler-0.6.3/fofi/FoFiEncodings.h
--- poppler-0.6.3.orig/fofi/FoFiEncodings.h	Mon Nov  5 00:10:59 2007
+++ poppler-0.6.3/fofi/FoFiEncodings.h	Mon Jan  7 14:17:50 2008
@@ -13,22 +13,28 @@
 #pragma interface
 #endif
 
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
 #include "goo/gtypes.h"
 
 //------------------------------------------------------------------------
 // Type 1 and 1C font data
 //------------------------------------------------------------------------
 
-extern char *fofiType1StandardEncoding[256];
-extern char *fofiType1ExpertEncoding[256];
+extern IMPORT char *fofiType1StandardEncoding[256];
+extern IMPORT char *fofiType1ExpertEncoding[256];
 
 //------------------------------------------------------------------------
 // Type 1C font data
 //------------------------------------------------------------------------
 
-extern char *fofiType1CStdStrings[391];
-extern Gushort fofiType1CISOAdobeCharset[229];
-extern Gushort fofiType1CExpertCharset[166];
-extern Gushort fofiType1CExpertSubsetCharset[87];
+extern IMPORT char *fofiType1CStdStrings[391];
+extern IMPORT Gushort fofiType1CISOAdobeCharset[229];
+extern IMPORT Gushort fofiType1CExpertCharset[166];
+extern IMPORT Gushort fofiType1CExpertSubsetCharset[87];
 
 #endif
diff -rubBN poppler-0.6.3.orig/goo/GooMutex.h poppler-0.6.3/goo/GooMutex.h
--- poppler-0.6.3.orig/goo/GooMutex.h	Mon Nov  5 00:11:03 2007
+++ poppler-0.6.3/goo/GooMutex.h	Mon Jan  7 13:32:47 2008
@@ -22,7 +22,7 @@
 // ...
 // gDestroyMutex(&m);
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include <windows.h>
 
diff -rubBN poppler-0.6.3.orig/goo/gfile.cc poppler-0.6.3/goo/gfile.cc
--- poppler-0.6.3.orig/goo/gfile.cc	Mon Nov  5 00:11:03 2007
+++ poppler-0.6.3/goo/gfile.cc	Mon Jan  7 13:41:37 2008
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <time.h>
 #else
 #  if defined(MACOS)
@@ -22,13 +22,13 @@
 #  endif
 #  include <limits.h>
 #  include <string.h>
-#  if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
+#  if !defined(VMS) && !defined(ACORN) && !defined(MACOS) && !defined(_WIN32)
 #    include <pwd.h>
 #  endif
 #  if defined(VMS) && (__DECCXX_VER < 50200000)
 #    include <unixlib.h>
 #  endif
-#endif // WIN32
+#endif // _WIN32
 #include "GooString.h"
 #include "gfile.h"
 
@@ -45,7 +45,7 @@
   //---------- VMS ----------
   return new GooString("SYS$LOGIN:");
 
-#elif defined(__EMX__) || defined(WIN32)
+#elif defined(__EMX__) || defined(_WIN32)
   //---------- OS/2+EMX and Win32 ----------
   char *s;
   GooString *ret;
@@ -91,7 +91,7 @@
 
 #if defined(__EMX__)
   if (_getcwd2(buf, sizeof(buf)))
-#elif defined(WIN32)
+#elif defined(_WIN32)
   if (GetCurrentDirectory(sizeof(buf), buf))
 #elif defined(ACORN)
   if (strcpy(buf, "@"))
@@ -145,7 +145,7 @@
   }
   return path;
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
   //---------- Win32 ----------
   GooString *tmp;
   char buf[256];
@@ -281,7 +281,7 @@
     return new GooString(fileName, p + 1 - fileName);
   return new GooString();
 
-#elif defined(__EMX__) || defined(WIN32)
+#elif defined(__EMX__) || defined(_WIN32)
   //---------- OS/2+EMX and Win32 ----------
   char *p;
 
@@ -325,7 +325,7 @@
   return strchr(path, ':') ||
 	 (path[0] == '[' && path[1] != '.' && path[1] != '-');
 
-#elif defined(__EMX__) || defined(WIN32)
+#elif defined(__EMX__) || defined(_WIN32)
   //---------- OS/2+EMX and Win32 ----------
   return path[0] == '/' || path[0] == '\\' || path[1] == ':';
 
@@ -355,7 +355,7 @@
   }
   return path;
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
   //---------- Win32 ----------
   char buf[_MAX_PATH];
   char *fp;
@@ -426,7 +426,7 @@
 }
 
 time_t getModTime(char *fileName) {
-#ifdef WIN32
+#ifdef _WIN32
   //~ should implement this, but it's (currently) only used in xpdf
   return 0;
 #else
@@ -440,7 +440,7 @@
 }
 
 GBool openTempFile(GooString **name, FILE **f, char *mode, char *ext) {
-#if defined(WIN32)
+#if defined(_WIN32)
   //---------- Win32 ----------
   char *tempDir;
   GooString *s, *s2;
@@ -600,7 +600,7 @@
 GDirEntry::GDirEntry(char *dirPath, char *nameA, GBool doStat) {
 #ifdef VMS
   char *p;
-#elif defined(WIN32)
+#elif defined(_WIN32)
   int fa;
 #elif defined(ACORN)
 #else
@@ -618,7 +618,7 @@
       dir = gTrue;
 #elif defined(ACORN)
 #else
-#ifdef WIN32
+#ifdef _WIN32
     fa = GetFileAttributes(fullPath->getCString());
     dir = (fa != 0xFFFFFFFF && (fa & FILE_ATTRIBUTE_DIRECTORY));
 #else
@@ -637,7 +637,7 @@
 GDir::GDir(char *name, GBool doStatA) {
   path = new GooString(name);
   doStat = doStatA;
-#if defined(WIN32)
+#if defined(_WIN32)
   GooString *tmp;
 
   tmp = path->copy();
@@ -656,7 +656,7 @@
 
 GDir::~GDir() {
   delete path;
-#if defined(WIN32)
+#if defined(_WIN32)
   if (hnd) {
     FindClose(hnd);
     hnd = NULL;
@@ -672,7 +672,7 @@
 GDirEntry *GDir::getNextEntry() {
   GDirEntry *e;
 
-#if defined(WIN32)
+#if defined(_WIN32)
   if (hnd) {
     e = new GDirEntry(path->getCString(), ffd.cFileName, doStat);
     if (hnd  && !FindNextFile(hnd, &ffd)) {
@@ -716,7 +716,7 @@
 }
 
 void GDir::rewind() {
-#ifdef WIN32
+#ifdef _WIN32
   GooString *tmp;
 
   if (hnd)
diff -rubBN poppler-0.6.3.orig/goo/gfile.h poppler-0.6.3/goo/gfile.h
--- poppler-0.6.3.orig/goo/gfile.h	Mon Nov  5 00:11:03 2007
+++ poppler-0.6.3/goo/gfile.h	Mon Jan  7 13:41:43 2008
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 extern "C" {
-#if defined(WIN32)
+#if defined(_WIN32)
 #  include <sys/stat.h>
 #  ifdef FPTEX
 #    include <win32lib.h>
@@ -126,7 +126,7 @@
 
   GooString *path;		// directory path
   GBool doStat;			// call stat() for each entry?
-#if defined(WIN32)
+#if defined(_WIN32)
   WIN32_FIND_DATA ffd;
   HANDLE hnd;
 #elif defined(ACORN)
diff -rubBN poppler-0.6.3.orig/poppler/ABWOutputDev.h poppler-0.6.3/poppler/ABWOutputDev.h
--- poppler-0.6.3.orig/poppler/ABWOutputDev.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/ABWOutputDev.h	Mon Jan  7 13:42:02 2008
@@ -27,7 +27,7 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  define SLASH '\\'
 #else
 #  define SLASH '/'
diff -rubBN poppler-0.6.3.orig/poppler/BuiltinFontTables.h poppler-0.6.3/poppler/BuiltinFontTables.h
--- poppler-0.6.3.orig/poppler/BuiltinFontTables.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/BuiltinFontTables.h	Mon Jan  7 14:18:07 2008
@@ -9,13 +9,19 @@
 #ifndef BUILTINFONTTABLES_H
 #define BUILTINFONTTABLES_H
 
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
 #include "BuiltinFont.h"
 
 #define nBuiltinFonts      14
 #define nBuiltinFontSubsts 12
 
-extern BuiltinFont builtinFonts[nBuiltinFonts];
-extern BuiltinFont *builtinFontSubst[nBuiltinFontSubsts];
+extern IMPORT BuiltinFont builtinFonts[nBuiltinFonts];
+extern IMPORT BuiltinFont *builtinFontSubst[nBuiltinFontSubsts];
 
 extern void initBuiltinFontTables();
 extern void freeBuiltinFontTables();
diff -rubBN poppler-0.6.3.orig/poppler/DCTStream.h poppler-0.6.3/poppler/DCTStream.h
--- poppler-0.6.3.orig/poppler/DCTStream.h	Mon Nov  5 00:11:03 2007
+++ poppler-0.6.3/poppler/DCTStream.h	Mon Jan  7 13:42:12 2008
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <string.h>
diff -rubBN poppler-0.6.3.orig/poppler/Error.cc poppler-0.6.3/poppler/Error.cc
--- poppler-0.6.3.orig/poppler/Error.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/Error.cc	Mon Jan  7 14:01:14 2008
@@ -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;
 }
diff -rubBN poppler-0.6.3.orig/poppler/FlateStream.h poppler-0.6.3/poppler/FlateStream.h
--- poppler-0.6.3.orig/poppler/FlateStream.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/FlateStream.h	Mon Jan  7 13:42:14 2008
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <string.h>
diff -rubBN poppler-0.6.3.orig/poppler/FontEncodingTables.h poppler-0.6.3/poppler/FontEncodingTables.h
--- poppler-0.6.3.orig/poppler/FontEncodingTables.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/FontEncodingTables.h	Mon Jan  7 14:18:21 2008
@@ -9,12 +9,18 @@
 #ifndef FONTENCODINGTABLES_H
 #define FONTENCODINGTABLES_H
 
-extern char *macRomanEncoding[];
-extern char *macExpertEncoding[];
-extern char *winAnsiEncoding[];
-extern char *standardEncoding[];
-extern char *expertEncoding[];
-extern char *symbolEncoding[];
-extern char *zapfDingbatsEncoding[];
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
+extern IMPORT char *macRomanEncoding[];
+extern IMPORT char *macExpertEncoding[];
+extern IMPORT char *winAnsiEncoding[];
+extern IMPORT char *standardEncoding[];
+extern IMPORT char *expertEncoding[];
+extern IMPORT char *symbolEncoding[];
+extern IMPORT char *zapfDingbatsEncoding[];
 
 #endif
diff -rubBN poppler-0.6.3.orig/poppler/Gfx.cc poppler-0.6.3/poppler/Gfx.cc
--- poppler-0.6.3.orig/poppler/Gfx.cc	Wed Nov 28 21:20:48 2007
+++ poppler-0.6.3/poppler/Gfx.cc	Mon Jan  7 13:42:32 2008
@@ -82,7 +82,7 @@
 // Operator table
 //------------------------------------------------------------------------
 
-#ifdef WIN32 // this works around a bug in the VC7 compiler
+#ifdef _WIN32 // this works around a bug in the VC7 compiler
 #  pragma optimize("",off)
 #endif
 
@@ -255,7 +255,7 @@
           &Gfx::opCurveTo2},
 };
 
-#ifdef WIN32 // this works around a bug in the VC7 compiler
+#ifdef _WIN32 // this works around a bug in the VC7 compiler
 #  pragma optimize("",on)
 #endif
 
diff -rubBN poppler-0.6.3.orig/poppler/GlobalParams.cc poppler-0.6.3/poppler/GlobalParams.cc
--- poppler-0.6.3.orig/poppler/GlobalParams.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/GlobalParams.cc	Mon Jan  7 13:43:01 2008
@@ -16,11 +16,11 @@
 #include <stdio.h>
 #include <ctype.h>
 #ifdef ENABLE_PLUGINS
-#  ifndef WIN32
+#  ifndef _WIN32
 #    include <dlfcn.h>
 #  endif
 #endif
-#ifdef WIN32
+#ifdef _WIN32
 #  include <shlobj.h>
 #endif
 #include <fontconfig/fontconfig.h>
@@ -42,7 +42,7 @@
 #include "GlobalParams.h"
 #include "GfxFont.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #  define strcasecmp stricmp
 #endif
 
@@ -71,7 +71,7 @@
 #include "UTF8.h"
 
 #ifdef ENABLE_PLUGINS
-#  ifdef WIN32
+#  ifdef _WIN32
 extern XpdfPluginVecTable xpdfPluginVecTable;
 #  endif
 #endif
@@ -119,7 +119,7 @@
   }
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 //------------------------------------------------------------------------
 // WinFontInfo
@@ -362,7 +362,7 @@
   return 1;
 }
 
-#endif // WIN32
+#endif // _WIN32
 
 //------------------------------------------------------------------------
 // PSFontParam
@@ -397,7 +397,7 @@
 
 private:
 
-#ifdef WIN32
+#ifdef _WIN32
   Plugin(HMODULE libA);
   HMODULE lib;
 #else
@@ -411,7 +411,7 @@
   Plugin *plugin;
   XpdfPluginVecTable *vt;
   XpdfBool (*xpdfInitPlugin)(void);
-#ifdef WIN32
+#ifdef _WIN32
   HMODULE libA;
 #else
   void *dlA;
@@ -422,7 +422,7 @@
   appendToPath(path, type);
   appendToPath(path, name);
 
-#ifdef WIN32
+#ifdef _WIN32
   path->append(".dll");
   if (!(libA = LoadLibrary(path->getCString()))) {
     error(-1, "Failed to load plugin '%s'",
@@ -456,7 +456,7 @@
   }
   memcpy(vt, &xpdfPluginVecTable, sizeof(xpdfPluginVecTable));
 
-#ifdef WIN32
+#ifdef _WIN32
   if (!(xpdfInitPlugin = (XpdfBool (*)(void))
 	                     GetProcAddress(libA, "xpdfInitPlugin"))) {
     error(-1, "Failed to find xpdfInitPlugin in plugin '%s'",
@@ -477,7 +477,7 @@
     goto err2;
   }
 
-#ifdef WIN32
+#ifdef _WIN32
   plugin = new Plugin(libA);
 #else
   plugin = new Plugin(dlA);
@@ -487,7 +487,7 @@
   return plugin;
 
  err2:
-#ifdef WIN32
+#ifdef _WIN32
   FreeLibrary(libA);
 #else
   dlclose(dlA);
@@ -497,7 +497,7 @@
   return NULL;
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 Plugin::Plugin(HMODULE libA) {
   lib = libA;
 }
@@ -510,7 +510,7 @@
 Plugin::~Plugin() {
   void (*xpdfFreePlugin)(void);
 
-#ifdef WIN32
+#ifdef _WIN32
   if ((xpdfFreePlugin = (void (*)(void))
                             GetProcAddress(lib, "xpdfFreePlugin"))) {
     (*xpdfFreePlugin)();
@@ -554,7 +554,7 @@
     }
   }
 
-#ifdef WIN32
+#ifdef _WIN32
   // baseDir will be set by a call to setBaseDir
   baseDir = new GooString();
 #else
@@ -583,7 +583,7 @@
   psOPI = gFalse;
   psASCIIHex = gFalse;
   textEncoding = new GooString("UTF-8");
-#if defined(WIN32)
+#if defined(_WIN32)
   textEOL = eolDOS;
 #elif defined(MACOS)
   textEOL = eolMac;
@@ -615,7 +615,7 @@
   unicodeMapCache = new UnicodeMapCache();
   cMapCache = new CMapCache();
 
-#ifdef WIN32
+#ifdef _WIN32
   winFontList = NULL;
 #endif
 
@@ -772,7 +772,7 @@
   deleteGooHash(unicodeMaps, GooString);
   deleteGooList(toUnicodeDirs, GooString);
   deleteGooHash(displayFonts, DisplayFontParam);
-#ifdef WIN32
+#ifdef _WIN32
   if (winFontList) {
     delete winFontList;
   }
diff -rubBN poppler-0.6.3.orig/poppler/GlobalParams.h poppler-0.6.3/poppler/GlobalParams.h
--- poppler-0.6.3.orig/poppler/GlobalParams.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/GlobalParams.h	Mon Jan  7 14:18:31 2008
@@ -23,6 +23,12 @@
 #include "goo/GooMutex.h"
 #endif
 
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
 class GooString;
 class GooList;
 class GooHash;
@@ -36,14 +42,14 @@
 struct XpdfSecurityHandler;
 class GlobalParams;
 class GfxFont;
-#ifdef WIN32
+#ifdef _WIN32
 class WinFontList;
 #endif
 
 //------------------------------------------------------------------------
 
 // The global parameters object.
-extern GlobalParams *globalParams;
+extern IMPORT GlobalParams *globalParams;
 
 //------------------------------------------------------------------------
 
@@ -262,7 +268,7 @@
   GooList *toUnicodeDirs;		// list of ToUnicode CMap dirs [GooString]
   GooHash *displayFonts;		// display font info, indexed by font name
 				//   [DisplayFontParam]
-#ifdef WIN32
+#ifdef _WIN32
   WinFontList *winFontList;	// system TrueType fonts
 #endif
   GBool psExpandSmaller;	// expand smaller pages to fill paper
diff -rubBN poppler-0.6.3.orig/poppler/Link.cc poppler-0.6.3/poppler/Link.cc
--- poppler-0.6.3.orig/poppler/Link.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/Link.cc	Mon Jan  7 13:43:21 2008
@@ -124,7 +124,7 @@
 
   // dictionary
   } else if (fileSpecObj->isDict()) {
-#ifdef WIN32
+#ifdef _WIN32
     if (!fileSpecObj->dictLookup("DOS", &obj1)->isString()) {
 #else
     if (!fileSpecObj->dictLookup("Unix", &obj1)->isString()) {
@@ -146,7 +146,7 @@
 
   // system-dependent path manipulation
   if (name) {
-#ifdef WIN32
+#ifdef _WIN32
     int i, j;
 
     // "//...."             --> "\...."
@@ -507,7 +507,7 @@
       fileName = getFileSpecName(&obj1);
     } else {
       obj1.free();
-#ifdef WIN32
+#ifdef _WIN32
       if (actionObj->dictLookup("Win", &obj1)->isDict()) {
 	obj1.dictLookup("F", &obj2);
 	fileName = getFileSpecName(&obj2);
diff -rubBN poppler-0.6.3.orig/poppler/PDFDoc.cc poppler-0.6.3/poppler/PDFDoc.cc
--- poppler-0.6.3.orig/poppler/PDFDoc.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/PDFDoc.cc	Mon Jan  7 13:43:29 2008
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#ifdef WIN32
+#ifdef _WIN32
 #  include <windows.h>
 #endif
 #include "goo/GooString.h"
@@ -102,7 +102,7 @@
   ok = setup(ownerPassword, userPassword);
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
 	       GooString *userPassword, void *guiDataA) {
   OSVERSIONINFO version;
diff -rubBN poppler-0.6.3.orig/poppler/PDFDoc.h poppler-0.6.3/poppler/PDFDoc.h
--- poppler-0.6.3.orig/poppler/PDFDoc.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/PDFDoc.h	Mon Jan  7 13:43:34 2008
@@ -37,7 +37,7 @@
   PDFDoc(GooString *fileNameA, GooString *ownerPassword = NULL,
 	 GooString *userPassword = NULL, void *guiDataA = NULL);
 
-#ifdef WIN32
+#ifdef _WIN32
   PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword = NULL,
 	 GooString *userPassword = NULL, void *guiDataA = NULL);
 #endif
diff -rubBN poppler-0.6.3.orig/poppler/PDFDocEncoding.h poppler-0.6.3/poppler/PDFDocEncoding.h
--- poppler-0.6.3.orig/poppler/PDFDocEncoding.h	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/PDFDocEncoding.h	Mon Jan  7 14:18:45 2008
@@ -9,8 +9,14 @@
 #ifndef PDFDOCENCODING_H
 #define PDFDOCENCODING_H
 
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
 #include "CharTypes.h"
 
-extern Unicode pdfDocEncoding[256];
+extern IMPORT Unicode pdfDocEncoding[256];
 
 #endif
diff -rubBN poppler-0.6.3.orig/poppler/PSOutputDev.cc poppler-0.6.3/poppler/PSOutputDev.cc
--- poppler-0.6.3.orig/poppler/PSOutputDev.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/PSOutputDev.cc	Mon Jan  7 13:43:52 2008
@@ -979,7 +979,7 @@
   } else if (fileName[0] == '|') {
     fileTypeA = psPipe;
 #ifdef HAVE_POPEN
-#ifndef WIN32
+#ifndef _WIN32
     signal(SIGPIPE, (SignalFunc)SIG_IGN);
 #endif
     if (!(f = popen(fileName + 1, "w"))) {
@@ -1187,7 +1187,7 @@
 #ifdef HAVE_POPEN
     else if (fileType == psPipe) {
       pclose((FILE *)outputStream);
-#ifndef WIN32
+#ifndef _WIN32
       signal(SIGPIPE, (SignalFunc)SIG_DFL);
 #endif
     }
diff -rubBN poppler-0.6.3.orig/poppler/Stream.cc poppler-0.6.3/poppler/Stream.cc
--- poppler-0.6.3.orig/poppler/Stream.cc	Thu Nov  8 23:13:50 2007
+++ poppler-0.6.3/poppler/Stream.cc	Mon Jan  7 13:43:58 2008
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <limits.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <string.h>
diff -rubBN poppler-0.6.3.orig/poppler/TextOutputDev.cc poppler-0.6.3/poppler/TextOutputDev.cc
--- poppler-0.6.3.orig/poppler/TextOutputDev.cc	Mon Nov  5 00:11:04 2007
+++ poppler-0.6.3/poppler/TextOutputDev.cc	Mon Jan  7 13:44:02 2008
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <math.h>
 #include <ctype.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <fcntl.h> // for O_BINARY
 #include <io.h>    // for setmode
 #endif
@@ -4469,7 +4469,7 @@
   if (fileName) {
     if (!strcmp(fileName, "-")) {
       outputStream = stdout;
-#ifdef WIN32
+#ifdef _WIN32
       // keep DOS from munging the end-of-line characters
       setmode(fileno(stdout), O_BINARY);
 #endif
diff -rubBN poppler-0.6.3.orig/poppler/XpdfPluginAPI.cc poppler-0.6.3/poppler/XpdfPluginAPI.cc
--- poppler-0.6.3.orig/poppler/XpdfPluginAPI.cc	Mon Nov  5 00:11:05 2007
+++ poppler-0.6.3/poppler/XpdfPluginAPI.cc	Mon Jan  7 13:44:07 2008
@@ -14,7 +14,7 @@
 #include "GlobalParams.h"
 #include "Object.h"
 #include "PDFDoc.h"
-#ifdef WIN32
+#ifdef _WIN32
 #include "WinPDFCore.h"
 #else
 #include "XPDFCore.h"
diff -rubBN poppler-0.6.3.orig/poppler/poppler-config.h poppler-0.6.3/poppler/poppler-config.h
--- poppler-0.6.3.orig/poppler/poppler-config.h	Mon Nov  5 00:11:05 2007
+++ poppler-0.6.3/poppler/poppler-config.h	Mon Jan  7 13:44:15 2008
@@ -89,7 +89,7 @@
 //------------------------------------------------------------------------
 
 // user config file name, relative to the user's home directory
-#if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
+#if defined(VMS) || (defined(_WIN32) && !defined(__CYGWIN32__))
 #define xpdfUserConfigFile "xpdfrc"
 #else
 #define xpdfUserConfigFile ".xpdfrc"
@@ -126,7 +126,7 @@
 #define pclose _pclose
 #endif
 
-#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(WIN32) || defined(__DJGPP__) || defined(MACOS)
+#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
 #define POPEN_READ_MODE "rb"
 #else
 #define POPEN_READ_MODE "r"
diff -rubBN poppler-0.6.3.orig/splash/SplashFontEngine.cc poppler-0.6.3/splash/SplashFontEngine.cc
--- poppler-0.6.3.orig/splash/SplashFontEngine.cc	Mon Nov  5 00:11:27 2007
+++ poppler-0.6.3/splash/SplashFontEngine.cc	Mon Jan  7 13:44:26 2008
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef WIN32
+#ifndef _WIN32
 #  include <unistd.h>
 #endif
 #include "goo/gmem.h"
@@ -128,7 +128,7 @@
   }
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -157,7 +157,7 @@
   }
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -202,7 +202,7 @@
   }
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -254,7 +254,7 @@
     gfree(codeToGID);
   }
 
-#ifndef WIN32
+#ifndef _WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
diff -rubBN poppler-0.6.3.orig/splash/SplashT1FontEngine.cc poppler-0.6.3/splash/SplashT1FontEngine.cc
--- poppler-0.6.3.orig/splash/SplashT1FontEngine.cc	Mon Nov  5 00:11:27 2007
+++ poppler-0.6.3/splash/SplashT1FontEngine.cc	Mon Jan  7 13:44:31 2008
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef WIN32
+#ifndef _WIN32
 #  include <unistd.h>
 #endif
 #include <t1lib.h>
diff -rubBN poppler-0.6.3.orig/splash/SplashTypes.h poppler-0.6.3/splash/SplashTypes.h
--- poppler-0.6.3.orig/splash/SplashTypes.h	Mon Nov  5 00:11:27 2007
+++ poppler-0.6.3/splash/SplashTypes.h	Mon Jan  7 14:19:40 2008
@@ -7,6 +7,12 @@
 #ifndef SPLASHTYPES_H
 #define SPLASHTYPES_H
 
+#ifdef __PARITY__
+#  define IMPORT __declspec(dllimport)
+#else
+#  define IMPORT
+#endif
+
 #include "goo/gtypes.h"
 
 //------------------------------------------------------------------------
@@ -49,7 +55,7 @@
 
 // number of components in each color mode
 // (defined in SplashState.cc)
-extern int splashColorModeNComps[];
+extern IMPORT int splashColorModeNComps[];
 
 // max number of components in any SplashColor
 #define splashMaxColorComps 4
diff -rubBN poppler-0.6.3.orig/utils/HtmlOutputDev.h poppler-0.6.3/utils/HtmlOutputDev.h
--- poppler-0.6.3.orig/utils/HtmlOutputDev.h	Mon Nov  5 00:11:29 2007
+++ poppler-0.6.3/utils/HtmlOutputDev.h	Mon Jan  7 13:44:39 2008
@@ -26,7 +26,7 @@
 #include "UnicodeMap.h"
 
 
-#ifdef WIN32
+#ifdef _WIN32
 #  define SLASH '\\'
 #else
 #  define SLASH '/'