[poppler] poppler/goo: GooTimer.cc,1.1,1.2 GooTimer.h,1.1,1.2

Albert Astals Cid aacid at freedesktop.org
Thu Dec 8 10:17:44 PST 2005


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

Modified Files:
	GooTimer.cc GooTimer.h 
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: GooTimer.cc
===================================================================
RCS file: /cvs/poppler/poppler/goo/GooTimer.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GooTimer.cc	29 Apr 2005 19:37:07 -0000	1.1
+++ GooTimer.cc	8 Dec 2005 18:17:42 -0000	1.2
@@ -9,6 +9,8 @@
 
 #include <config.h>
 
+#ifdef HAVE_GETTIMEOFDAY
+
 #ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
@@ -61,3 +63,4 @@
   return total;
 }
 
+#endif

Index: GooTimer.h
===================================================================
RCS file: /cvs/poppler/poppler/goo/GooTimer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GooTimer.h	29 Apr 2005 19:37:07 -0000	1.1
+++ GooTimer.h	8 Dec 2005 18:17:42 -0000	1.2
@@ -6,6 +6,8 @@
 //
 //========================================================================
 
+#ifdef HAVE_GETTIMEOFDAY
+
 #ifndef GOOTIMER_H
 #define GOOTIMER_H
 
@@ -38,3 +40,5 @@
 };
 
 #endif
+
+#endif



More information about the poppler mailing list