From 98ed5a2a3713298ff4baada87770a6fd43628b84 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Sat, 22 Oct 2005 07:09:54 +0000 Subject: [PATCH] Fix build on 64-bit platforms. Patch from Max Alekseyev --- golded.mak | 4 ++-- goldlib/gall/gtimall.h | 2 +- goldlib/gall/gutlvers.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/golded.mak b/golded.mak index 545d4f1..ccef009 100644 --- a/golded.mak +++ b/golded.mak @@ -23,9 +23,9 @@ NULL= NULL=nul !ENDIF -CPP=@cl.exe +CPP=@cl.exe /IC:\PROGRA~1\MICROS~2\VC98\INCLUDE RSC=rc.exe -LINK=@link.exe +LINK=@link.exe /LIBPATH:C:\PROGRA~1\MICROS~2\VC98\LIB !IF "$(CFG)" == "Release" OBJ_DIR=Release diff --git a/goldlib/gall/gtimall.h b/goldlib/gall/gtimall.h index 522041a..099332b 100644 --- a/goldlib/gall/gtimall.h +++ b/goldlib/gall/gtimall.h @@ -131,7 +131,7 @@ inline struct tm *ggmtime(const time32_t *timep) struct tm *time = gmtime(&temp); return time ? time : gmtime(&zero); #else - return gmtime(&temp); + return gmtime(temp); #endif } diff --git a/goldlib/gall/gutlvers.cpp b/goldlib/gall/gutlvers.cpp index 54e6201..d6b32c9 100644 --- a/goldlib/gall/gutlvers.cpp +++ b/goldlib/gall/gutlvers.cpp @@ -292,7 +292,7 @@ char *gcpuid(char *_cpuname) cpuname( scpuid.family, scpuid.model, scpuid.vendor, _cpuname); -#elif defined(__GNUC__) +#elif defined(__GNUC__) && defined(__i386__) asm( /* assembler code is based on code of FreeBSD kernel sources */ /* uses AT&T assembler notation */