diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-12-14 16:00:08 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-12-14 16:00:08 +0000 |
commit | 8c273f054451ef8ea3190e2cdc865bad291c4d88 (patch) | |
tree | 61d1a6542b0a1b044d61b70bbd5de987daf41b3e /Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES | |
parent | 87ca47281d522ade4d8596b91b04ac6354141d05 (diff) |
fix FreeBSD build problems
git-svn-id: svn://tug.org/texlive/trunk@16405 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime | 58 |
2 files changed, 64 insertions, 0 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog index 1508a5650ad..59b110e6c6c 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog +++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2009-12-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + Added patch-20-gettimeofday-or-ftime. + * configure.ac, src/dvisvgm.cpp: Check for gettimeofday() + and <sys/time.h> or ftime() and <sys/timeb.h>. + 2009-11-18 Peter Breitenlohner <peb@mppmu.mpg.de> Added patch-05-libdvisvgm-dlfcn. diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime new file mode 100644 index 00000000000..891117407da --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime @@ -0,0 +1,58 @@ + Use gettimeofday(), ftime(), or time(), as available. + +diff -ur dvisvgm-0.8.7.orig/configure.ac dvisvgm-0.8.7/configure.ac +--- dvisvgm-0.8.7.orig/configure.ac 2009-11-09 18:17:17.000000000 +0100 ++++ dvisvgm-0.8.7/configure.ac 2009-12-14 14:23:12.000000000 +0100 +@@ -22,6 +22,9 @@ + AC_PROG_RANLIB + AC_LANG(C) + ++AC_CHECK_FUNCS([ftime gettimeofday]) ++AC_CHECK_HEADERS([sys/time.h sys/timeb.h]) ++ + # Check whether MikTeX import libraries should be linked + case $host in + *-mingw32* | *-windows*) +diff -ur dvisvgm-0.8.7.orig/src/dvisvgm.cpp dvisvgm-0.8.7/src/dvisvgm.cpp +--- dvisvgm-0.8.7.orig/src/dvisvgm.cpp 2009-11-13 14:49:31.000000000 +0100 ++++ dvisvgm-0.8.7/src/dvisvgm.cpp 2009-12-14 14:37:35.000000000 +0100 +@@ -23,7 +23,6 @@ + #include <iostream> + #include <sstream> + #include <string> +-#include <sys/timeb.h> + #include <time.h> + #include "gzstream.h" + #include "CommandLine.h" +@@ -46,6 +45,12 @@ + #define EMAIL "Martin Gieseking <martin.gieseking@uos.de>" + #endif + ++#if defined (HAVE_SYS_TIME_H) ++#include <sys/time.h> ++#elif defined (HAVE_SYS_TIMEB_H) ++#include <sys/timeb.h> ++#endif ++ + using namespace std; + + +@@ -106,9 +111,18 @@ + + /** Returns timestamp (wall time) in seconds. */ + static double get_time () { ++#if defined (HAVE_SYS_TIME_H) ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ return tv.tv_sec + tv.tv_usec/1000000.0; ++#elif defined (HAVE_SYS_TIMEB_H) + struct timeb tb; + ftime(&tb); + return tb.time + tb.millitm/1000.0; ++#else ++ time_t myclock = time((time_t*)NULL); ++ return myclock; ++#endif + } + + |