From 9431c2a60a8f8e8f9cb4bf36d4103f1f42db1529 Mon Sep 17 00:00:00 2001
From: Dick Hollenbeck <dick@softplc.com>
Date: Sat, 14 Jan 2012 19:31:39 -0600
Subject: [PATCH] changes

---
 common/getrunningmicrosecs.cpp | 88 +++++++++++++++++++++-------------
 copyright.h                    |  2 +-
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/common/getrunningmicrosecs.cpp b/common/getrunningmicrosecs.cpp
index 12082fae3e..06dae30fda 100644
--- a/common/getrunningmicrosecs.cpp
+++ b/common/getrunningmicrosecs.cpp
@@ -1,42 +1,36 @@
 
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
+ * Copyright (C) 2012 KiCad Developers, see change_log.txt for contributors.
+ *
+ * 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 2
+ * 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, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
 #include <config.h>
 
 
-#if defined(HAVE_CLOCK_GETTIME)
-
-#include <time.h>
-
-unsigned GetRunningMicroSecs()
-{
-    struct timespec	now;
-
-    clock_gettime( CLOCK_MONOTONIC, &now );
-
-    unsigned usecs = ((unsigned)now.tv_nsec)/1000 + ((unsigned)now.tv_sec) * 1000000;
-//    unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000;
-
-    return usecs;
-}
-
-
-#elif defined(HAVE_GETTIMEOFDAY_FUNC)
-
-#include <sys/time.h>
-unsigned GetRunningMicroSecs()
-{
-    timeval tv;
-
-    gettimeofday( &tv, 0 );
-
-    return (tv.tv_sec * 1000000) + tv.tv_usec;
-}
-
-
-#elif defined(_WIN32)
+#if defined(_WIN32)
 
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
-#include <assert.h>
 
 unsigned GetRunningMicroSecs()
 {
@@ -69,5 +63,35 @@ int main( int argc, char** argv )
 }
 #endif
 
+
+#elif defined(HAVE_CLOCK_GETTIME)
+
+#include <time.h>
+
+unsigned GetRunningMicroSecs()
+{
+    struct timespec	now;
+
+    clock_gettime( CLOCK_MONOTONIC, &now );
+
+    unsigned usecs = ((unsigned)now.tv_nsec)/1000 + ((unsigned)now.tv_sec) * 1000000;
+//    unsigned msecs = (now.tv_nsec / (1000*1000)) + now.tv_sec * 1000;
+
+    return usecs;
+}
+
+
+#elif defined(HAVE_GETTIMEOFDAY_FUNC)
+
+#include <sys/time.h>
+unsigned GetRunningMicroSecs()
+{
+    timeval tv;
+
+    gettimeofday( &tv, 0 );
+
+    return (tv.tv_sec * 1000000) + tv.tv_usec;
+}
+
 #endif
 
diff --git a/copyright.h b/copyright.h
index f2822cace0..284fb110bb 100644
--- a/copyright.h
+++ b/copyright.h
@@ -13,7 +13,7 @@ may choose to document this corresponding work in the CHANGELOG.txt file.
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2012 <author>
- * Copyright (C) 2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2012 KiCad Developers, see CHANGELOG.TXT for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License