[Gnash-commit] gnash libbase/getclocktime.hpp libnet/buffer.h ...

[Markus Gothe]

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

Modified files:
        libbase        : getclocktime.hpp 
        libnet         : buffer.h cque.cpp cque.h 

Log message:
        Tidy up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/getclocktime.hpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/buffer.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.h?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: libbase/getclocktime.hpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/getclocktime.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/getclocktime.hpp    29 Mar 2008 02:50:46 -0000      1.3
+++ libbase/getclocktime.hpp    29 Mar 2008 03:12:45 -0000      1.4
@@ -16,6 +16,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#ifndef GETCLOCKTIMER_HPP
+#define GETCLOCKTIMER_HPP 1
+
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
 #endif
@@ -28,7 +31,7 @@
 
 #define CLOCK_REALTIME 0 /* Dummy */
 
-static int clock_gettime(int clk_id /* unused */, struct timespec *tp) {
+static int clock_gettime(int, struct timespec *tp) {
     
     struct timeval now;
     int ret = gettimeofday(&now, NULL);
@@ -42,3 +45,4 @@
 }
 
 #endif
\ No newline at end of file
+#endif /* GETCLOCKTIMER_HPP */
\ No newline at end of file

Index: libnet/buffer.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/buffer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/buffer.h     28 Mar 2008 21:30:24 -0000      1.2
+++ libnet/buffer.h     29 Mar 2008 03:12:45 -0000      1.3
@@ -21,8 +21,8 @@
 
 #include <boost/cstdint.hpp>
 #include <string>
-#include <time.h>
 
+#include "getclocktime.hpp"
 #include "network.h"
 
 // _definst_ is the default instance name

Index: libnet/cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libnet/cque.cpp     29 Mar 2008 02:56:54 -0000      1.5
+++ libnet/cque.cpp     29 Mar 2008 03:12:45 -0000      1.6
@@ -24,11 +24,10 @@
 #include <vector>
 #include <deque>
 
-#include "getclocktime.hpp"
+#include "cque.h"
 #include "log.h"
 #include "gmemory.h"
 #include "buffer.h"
-#include "cque.h"
 
 using namespace gnash;
 using namespace std;

Index: libnet/cque.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libnet/cque.h       29 Mar 2008 00:06:18 -0000      1.3
+++ libnet/cque.h       29 Mar 2008 03:12:46 -0000      1.4
@@ -24,6 +24,7 @@
 #include <boost/thread/condition.hpp>
 #include <deque>
 
+#include "getclocktime.hpp"
 #include "buffer.h"
 #include "network.h"