[poppler] poppler/splash: SplashFTFontEngine.cc, 1.2, 1.3 SplashFontFile.cc, 1.1.1.1, 1.2

[Albert Astals Cid]

Update of /cvs/poppler/poppler/splash
In directory gabe:/tmp/cvs-serv28447/splash

Modified Files:
	SplashFTFontEngine.cc SplashFontFile.cc 
Log Message:
	* configure.ac: Detect if gettimeofday is available, fixes for correct
        linking to Qt4 on windows
        * goo/GooTimer.[cc|h]: Only build if gettimeofday is available
        * poppler/Gfx.cc: Only use the timer for profiling if gettimeofday is
        available
        * poppler/GlobalParams.cc: Remove extra unlockGlobalParams that was
        making windows hang
        * splash/SplashFTFontEngine.cc: i need unistd.h on windows also
        * splash/SplashFontFile.cc: i need unistd.h on windows also


Index: SplashFTFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFTFontEngine.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SplashFTFontEngine.cc	15 Sep 2005 22:09:50 -0000	1.2
+++ SplashFTFontEngine.cc	8 Dec 2005 18:17:42 -0000	1.3
@@ -13,9 +13,7 @@
 #endif
 
 #include <stdio.h>
-#ifndef WIN32
-#  include <unistd.h>
-#endif
+#include <unistd.h>
 #include "goo/gmem.h"
 #include "goo/GooString.h"
 #include "goo/gfile.h"

Index: SplashFontFile.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontFile.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SplashFontFile.cc	3 Mar 2005 19:45:59 -0000	1.1.1.1
+++ SplashFontFile.cc	8 Dec 2005 18:17:42 -0000	1.2
@@ -11,9 +11,7 @@
 #endif
 
 #include <stdio.h>
-#ifndef WIN32
-#  include <unistd.h>
-#endif
+#include <unistd.h>
 #include "goo/GooString.h"
 #include "SplashFontFile.h"
 #include "SplashFontFileID.h"