summaryrefslogtreecommitdiff
path: root/splash
diff options
context:
space:
mode:
authorKrzysztof Kowalczyk <kkowalczyk@gmail.com>2007-09-14 06:17:35 +0000
committerKrzysztof Kowalczyk <kkowalczyk@gmail.com>2007-09-14 06:17:35 +0000
commit3330763ddca66b30d5ee60aab94d6fe0bbae9c8f (patch)
treeeae0f9fde94c4303b173fac26d4d64c5b01fdb68 /splash
parent6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd (diff)
windows/msvc compilation fixes
Diffstat (limited to 'splash')
-rw-r--r--splash/SplashFTFontEngine.cc2
-rw-r--r--splash/SplashFontEngine.cc2
-rw-r--r--splash/SplashFontFile.cc2
-rw-r--r--splash/SplashFontFile.h3
-rw-r--r--splash/SplashT1FontEngine.cc2
5 files changed, 8 insertions, 3 deletions
diff --git a/splash/SplashFTFontEngine.cc b/splash/SplashFTFontEngine.cc
index 066d48db..e84f0568 100644
--- a/splash/SplashFTFontEngine.cc
+++ b/splash/SplashFTFontEngine.cc
@@ -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"
diff --git a/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc
index 4b898910..4930eef8 100644
--- a/splash/SplashFontEngine.cc
+++ b/splash/SplashFontEngine.cc
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <stdio.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include "goo/gmem.h"
diff --git a/splash/SplashFontFile.cc b/splash/SplashFontFile.cc
index 9dabd1fd..1c70d3c8 100644
--- a/splash/SplashFontFile.cc
+++ b/splash/SplashFontFile.cc
@@ -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"
diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h
index ad2bc89b..1e4639eb 100644
--- a/splash/SplashFontFile.h
+++ b/splash/SplashFontFile.h
@@ -23,7 +23,8 @@ class SplashFontFileID;
// SplashFontFile
//------------------------------------------------------------------------
-struct SplashFontSrc {
+class SplashFontSrc {
+public:
SplashFontSrc();
~SplashFontSrc();
diff --git a/splash/SplashT1FontEngine.cc b/splash/SplashT1FontEngine.cc
index 722306e8..be75e03a 100644
--- a/splash/SplashT1FontEngine.cc
+++ b/splash/SplashT1FontEngine.cc
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <stdio.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <t1lib.h>