From 2af32ece373890135f1b29a88856f0bf297c9376 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Wed, 5 Sep 2012 17:17:18 -0700
Subject: [PATCH] Refactored timestamp functions into timestamp.c

---
 libguac/src/Makefile.am |  1 +
 libguac/src/protocol.c  | 41 -----------------------
 libguac/src/timestamp.c | 73 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 41 deletions(-)
 create mode 100644 libguac/src/timestamp.c

diff --git a/libguac/src/Makefile.am b/libguac/src/Makefile.am
index 10d36873..f5130a46 100644
--- a/libguac/src/Makefile.am
+++ b/libguac/src/Makefile.am
@@ -63,6 +63,7 @@ libguac_la_SOURCES =  \
 	palette.c         \
 	protocol.c        \
 	socket.c          \
+	timestamp.c       \
 	unicode.c
 
 lib_LTLIBRARIES = libguac.la
diff --git a/libguac/src/protocol.c b/libguac/src/protocol.c
index d3e9d5ff..42fe5f9c 100644
--- a/libguac/src/protocol.c
+++ b/libguac/src/protocol.c
@@ -35,14 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
-#include <time.h>
-#endif
-
-#ifndef HAVE_CLOCK_GETTIME
-#include <sys/time.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -60,12 +52,6 @@
 
 #include <sys/types.h>
 
-#ifdef __MINGW32__
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
-
 #include "error.h"
 #include "layer.h"
 #include "palette.h"
@@ -367,33 +353,6 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
 }
 
 
-guac_timestamp guac_timestamp_current() {
-
-#ifdef HAVE_CLOCK_GETTIME
-
-    struct timespec current;
-
-    /* Get current time */
-    clock_gettime(CLOCK_REALTIME, &current);
-    
-    /* Calculate milliseconds */
-    return (guac_timestamp) current.tv_sec * 1000 + current.tv_nsec / 1000000;
-
-#else
-
-    struct timeval current;
-
-    /* Get current time */
-    gettimeofday(&current, NULL);
-    
-    /* Calculate milliseconds */
-    return (guac_timestamp) current.tv_sec * 1000 + current.tv_usec / 1000;
-
-#endif
-
-}
-
-
 /* Protocol functions */
 
 int guac_protocol_send_args(guac_socket* socket, const char** args) {
diff --git a/libguac/src/timestamp.c b/libguac/src/timestamp.c
new file mode 100644
index 00000000..a610d8f1
--- /dev/null
+++ b/libguac/src/timestamp.c
@@ -0,0 +1,73 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
+#include <time.h>
+#endif
+
+#ifndef HAVE_CLOCK_GETTIME
+#include <sys/time.h>
+#endif
+
+#include "timestamp.h"
+
+guac_timestamp guac_timestamp_current() {
+
+#ifdef HAVE_CLOCK_GETTIME
+
+    struct timespec current;
+
+    /* Get current time */
+    clock_gettime(CLOCK_REALTIME, &current);
+    
+    /* Calculate milliseconds */
+    return (guac_timestamp) current.tv_sec * 1000 + current.tv_nsec / 1000000;
+
+#else
+
+    struct timeval current;
+
+    /* Get current time */
+    gettimeofday(&current, NULL);
+    
+    /* Calculate milliseconds */
+    return (guac_timestamp) current.tv_sec * 1000 + current.tv_usec / 1000;
+
+#endif
+
+}
+