From c924c0e03f3a68bb5144cca561b654b3203ba127 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 19 Nov 2007 08:59:23 +0000
Subject: Removed useless win32 implementation of gettimeofday.

---
 ChangeLog                     |  6 ++++
 accountserver.cbp             | 10 ------
 gameserver.cbp                | 10 ------
 src/utils/timer.cpp           |  2 +-
 src/utils/wingettimeofday.cpp | 79 -------------------------------------------
 src/utils/wingettimeofday.h   | 39 ---------------------
 6 files changed, 7 insertions(+), 139 deletions(-)
 delete mode 100644 src/utils/wingettimeofday.cpp
 delete mode 100644 src/utils/wingettimeofday.h

diff --git a/ChangeLog b/ChangeLog
index 24d8d9fd..ca5473c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-19  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* accountserver.cbp, gameserver.cbp, src/utils/timer.cpp,
+	src/utils/wingettimeofday.cpp, src/utils/wingettimeofday.h: Removed
+	useless win32 implementation of gettimeofday.
+
 2007-11-15  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* data/scripts/libtmw.lua: Added do_wait helper function.
diff --git a/accountserver.cbp b/accountserver.cbp
index 8262afe5..b8d00267 100644
--- a/accountserver.cbp
+++ b/accountserver.cbp
@@ -374,16 +374,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\utils\wingettimeofday.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\utils\wingettimeofday.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\utils\xml.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
diff --git a/gameserver.cbp b/gameserver.cbp
index 15e1d472..31b0d67a 100644
--- a/gameserver.cbp
+++ b/gameserver.cbp
@@ -467,16 +467,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\utils\wingettimeofday.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\utils\wingettimeofday.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\utils\xml.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index a1d8bd46..51791935 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #ifdef _WIN32
-#include "wingettimeofday.h"
+#include <windows.h>
 #endif
 
 namespace utils
diff --git a/src/utils/wingettimeofday.cpp b/src/utils/wingettimeofday.cpp
deleted file mode 100644
index baaa433b..00000000
--- a/src/utils/wingettimeofday.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifdef _WIN32
-
-#include "wingettimeofday.h"
-
-int gettimeofday(struct timeval* tv, void *tz)
-/*---------------------------------------------------------------        
- * Copyright (c) 1999,2000,2001,2002,2003                                
- * The Board of Trustees of the University of Illinois                   
- * All Rights Reserved.                                                  
- *---------------------------------------------------------------        
- * Permission is hereby granted, free of charge, to any person           
- * obtaining a copy of this software (Iperf) and associated              
- * documentation files (the "Software"), to deal in the Software         
- * without restriction, including without limitation the                 
- * rights to use, copy, modify, merge, publish, distribute,              
- * sublicense, and/or sell copies of the Software, and to permit         
- * persons to whom the Software is furnished to do                       
- * so, subject to the following conditions:                              
- *                                                                       
- *                                                                       
- * Redistributions of source code must retain the above                  
- * copyright notice, this list of conditions and                         
- * the following disclaimers.                                            
- *                                                                       
- *                                                                       
- * Redistributions in binary form must reproduce the above               
- * copyright notice, this list of conditions and the following           
- * disclaimers in the documentation and/or other materials               
- * provided with the distribution.                                       
- *                                                                       
- *                                                                       
- * Neither the names of the University of Illinois, NCSA,                
- * nor the names of its contributors may be used to endorse              
- * or promote products derived from this Software without                
- * specific prior written permission.                                    
- *                                                                       
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES       
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND              
- * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT       
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,          
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,                  
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE                        
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                
- * ________________________________________________________________      
- * National Laboratory for Applied Network Research                      
- * National Center for Supercomputing Applications                       
- * University of Illinois at Urbana-Champaign                            
- * http://www.ncsa.uiuc.edu                                              
- * ________________________________________________________________      
- *                                                                       
- * gettimeofday.c                                                        
- * by Mark Gates <mgates@nlanr.net>                                      
- * -------------------------------------------------------------------   
- * A (hack) implementation of gettimeofday for Windows.                  
- * Since I send sec/usec in UDP packets, this made the most sense.       
- * ------------------------------------------------------------------- */
-{
-    FILETIME time;
-    double   timed;
-
-    GetSystemTimeAsFileTime( &time );
-
-    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
-    // 4294967296 is 2^32, to shift high word over
-    // 11644473600 is the number of seconds between
-    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
-    // Tests found floating point to be 10x faster than 64bit int math.
-
-    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
-            (time.dwLowDateTime  * 1e-7);
-
-    tv->tv_sec  = (long) timed;
-    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
-
-    return 0;
-}
-
-#endif //_WIN32
diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h
deleted file mode 100644
index c19ef13e..00000000
--- a/src/utils/wingettimeofday.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World  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 any later version.
- *
- *  The Mana  World 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 The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *  $Id$
- */
-
-#ifndef _TMWSERV_WINGETTIMEOFDAY_H_
-#define _TMWSERV_WINGETTIMEOFDAY_H_
-
-#ifdef _WIN32
-
-#include <windows.h>
-
-/*
- * the function gettimeofday() is available on UNIX but not on windows.
- * this header defines a windows implementation as a
- * GetSystemTimeAsFileTime() wrapper.
- */
-
-int gettimeofday(struct timeval* tv, void *tz);
-
-#endif // _WIN32
-#endif
-- 
cgit v1.2.3-60-g2f50