X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fw32%2Fgetrusage.c;h=8f2a970978cbb3d0bb69c566677e3393bd1e2e4c;hp=810a42e69989faf6af76fc6facb9e38550ef3664;hb=fc779dd47a24cdbc6f8a358a8a04467fd7328b63;hpb=154bb241f0e0ca4b682014f82253101468ad7a5e

diff --git a/src/lib/w32/getrusage.c b/src/lib/w32/getrusage.c
index 810a42e69..8f2a97097 100644
--- a/src/lib/w32/getrusage.c
+++ b/src/lib/w32/getrusage.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire 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
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -48,19 +47,19 @@ getrusage(int who, struct rusage *rus)
     if (who == RUSAGE_SELF) {
 	HANDLE hProcess;
 	FILETIME ftCreation, ftExit, ftUser, ftKernel;
-	_int64 itmp;
+	__int64 itmp;
 
 	hProcess = GetCurrentProcess ();
 
 	GetProcessTimes (hProcess, &ftCreation, &ftExit, &ftKernel, &ftUser);
 
-	itmp = (_int64)ftUser.dwLowDateTime +
-	    ((_int64)ftUser.dwHighDateTime * (_int64)0x100000000);
+	itmp = (__int64)ftUser.dwLowDateTime +
+	    ((__int64)ftUser.dwHighDateTime * 0x100000000LL);
 	rus->ru_utime.tv_sec = (long)(itmp / 10000000U);
 	rus->ru_utime.tv_usec = (long)((itmp % 10000000U) / 10.);
 
-	itmp = (_int64)ftKernel.dwLowDateTime +
-	    ((_int64)ftKernel.dwHighDateTime * (_int64)0x100000000);
+	itmp = (__int64)ftKernel.dwLowDateTime +
+	    ((__int64)ftKernel.dwHighDateTime * 0x100000000LL);
 	rus->ru_stime.tv_sec = (long)(itmp / 10000000U);
 	rus->ru_stime.tv_usec = (long)((itmp % 10000000U) / 10.);
     } else {