diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/log.cpp | 8 | ||||
| -rw-r--r-- | src/utils/wingettimeofday.h | 113 | ||||
| -rw-r--r-- | tmw.cbp | 10 |
4 files changed, 20 insertions, 119 deletions
@@ -1,4 +1,10 @@ -2007-11-11 Bjørn Lindeijer <bjorn@lindeijer.nl> +2007-11-16 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/log.cpp, src/utils/wingettimeofday.h: Removed useless win32 + implementation of gettimeofday. + * src/log.cpp, tmw.cbp: Fixed minor issues. + +2007-11-11 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/gui/item_amount.cpp, src/gui/item_amount.h, src/gui/inventorywindow.cpp: Moved check on dropping 1 item to the diff --git a/src/log.cpp b/src/log.cpp index 224736bd..e0825ebc 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -21,13 +21,11 @@ #include "log.h" -#ifdef WIN32 -#include "utils/wingettimeofday.h" -#else #include <sys/time.h> -#endif -#ifdef __APPLE__ +#ifdef WIN32 +#include <windows.h> +#elif __APPLE__ #include <Carbon/Carbon.h> #endif diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h deleted file mode 100644 index 28afb7e5..00000000 --- a/src/utils/wingettimeofday.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The Mana World - * 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 _TMW_WINGETTIMEOFDAY_H_ -#define _TMW_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) -/*--------------------------------------------------------------- - * 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 -#endif @@ -1329,6 +1329,16 @@ <Option link="0"/> <Option target="default"/> </Unit> + <Unit filename="src\shopitem.cpp"> + <Option compilerVar="CPP"/> + <Option target="default"/> + </Unit> + <Unit filename="src\shopitem.h"> + <Option compilerVar=""/> + <Option compile="0"/> + <Option link="0"/> + <Option target="default"/> + </Unit> <Unit filename="src\simpleanimation.cpp"> <Option compilerVar="CPP"/> <Option target="default"/> |