[poppler] poppler/poppler: Gfx.cc, 1.4, 1.5 GlobalParams.cc, 1.11, 1.12

[Albert Astals Cid]

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

Modified Files:
	Gfx.cc GlobalParams.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: Gfx.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Gfx.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Gfx.cc	30 Oct 2005 20:29:05 -0000	1.4
+++ Gfx.cc	8 Dec 2005 18:17:42 -0000	1.5
@@ -549,7 +549,9 @@
   Object args[maxArgs];
   int numArgs, i;
   int lastAbortCheck;
+#ifdef HAVE_GETTIMEOFDAY
   GooTimer *timer;
+#endif
 
   // scan a sequence of objects
   updateLevel = lastAbortCheck = 0;
@@ -568,12 +570,15 @@
 	printf("\n");
 	fflush(stdout);
       }
+#ifdef HAVE_GETTIMEOFDAY
       if (profileCommands) 
 	timer = new GooTimer ();
+#endif
 
       // Run the operation
       execOp(&obj, args, numArgs);
 
+#ifdef HAVE_GETTIMEOFDAY
       // Update the profile information
       if (profileCommands) {
 	GooHash *hash;
@@ -594,6 +599,7 @@
 	}
 	delete (timer);
       }
+#endif
       obj.free();
       for (i = 0; i < numArgs; ++i)
 	args[i].free();

Index: GlobalParams.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GlobalParams.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- GlobalParams.cc	20 Sep 2005 14:00:43 -0000	1.11
+++ GlobalParams.cc	8 Dec 2005 18:17:42 -0000	1.12
@@ -1308,7 +1308,6 @@
     displayFonts->add(dfp->name,dfp);
   }
 fin:
-  unlockGlobalParams;
   if (m)
     FcPatternDestroy(m);
   if (p)