[Gnash-commit] gnash ChangeLog libnet/cque.cpp libbase/getcloc...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/03/29 02:46:59

Modified files:
        .              : ChangeLog 
        libnet         : cque.cpp 
Added files:
        libbase        : getclocktime.hpp 

Log message:
        Workaround for systems lacking clock_gettime().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/getclocktime.hpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6067&r2=1.6068
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6067
retrieving revision 1.6068
diff -u -b -r1.6067 -r1.6068
--- ChangeLog   28 Mar 2008 23:58:57 -0000      1.6067
+++ ChangeLog   29 Mar 2008 02:46:58 -0000      1.6068
@@ -1,3 +1,8 @@
+2008-03-29 Markus Gothe <address@hidden>
+
+       * libbase/getclocktime.hpp: Workaround for systems lacking
+         clock_gettime().
+
 2008-03-28 Russ Nelson <address@hidden>
 
        * Fix this problem report:

Index: libnet/cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libnet/cque.cpp     29 Mar 2008 00:06:17 -0000      1.3
+++ libnet/cque.cpp     29 Mar 2008 02:46:59 -0000      1.4
@@ -23,8 +23,8 @@
 #include <string>
 #include <vector>
 #include <deque>
-#include <ctime>
 
+#include "getclocktime.hpp"
 #include "log.h"
 #include "gmemory.h"
 #include "buffer.h"

Index: libbase/getclocktime.hpp
===================================================================
RCS file: libbase/getclocktime.hpp
diff -N libbase/getclocktime.hpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/getclocktime.hpp    29 Mar 2008 02:46:58 -0000      1.1
@@ -0,0 +1,46 @@
+//
+//   Copyright (C) 2008 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_CLOCK_GETTIME
+# include <ctime>
+#else
+# include <sys/time.h>
+#endif
+
+#ifndef HAVE_CLOCK_GETTIME
+
+#define  CLOCK_REALTIME 0 /* Dummy */
+
+static int clock_gettime(int clk_id /* unused */, struct timespec *tp) {
+    
+    struct timeval now;
+    int ret = gettimeofday(&now, NULL);
+    
+    if (ret != 0)
+        return ret;
+    
+    tp->tv_sec = now.tv_sec;
+    tp->tv_nsec = now.tv_usec * 1000;
+    return 0;
+}
+
+#endif
\ No newline at end of file