X-Authentication-Warning:	delorie.com: mail set sender to djgpp-workers-bounces using -f
X-Recipient:	djgpp-workers AT delorie DOT com
Date:	Thu, 11 Jun 2009 17:58:22 +0200
From:	"Juan Manuel Guerrero" <juan DOT guerrero AT gmx DOT de>
In-Reply-To:	<200906111543.n5BFhpJ5007949@envy.delorie.com>
Message-ID:	<20090611155822.66410@gmx.net>
MIME-Version:	1.0
References:	<20090611151046 DOT 27260 AT gmx DOT net>
	<200906111543 DOT n5BFhpJ5007949 AT envy DOT delorie DOT com>
Subject:	Re: multiple definitions of _rdtsc
To:	djgpp-workers AT delorie DOT com
X-Authenticated:	#27081556
X-Flags:	0001
X-Mailer:	WWW-Mail 6100 (Global Message Exchange)
X-Priority:	3
X-Provags-ID:	V01U2FsdGVkX198LBx9lZx8iLFOJ/SdpEGENAcTR6Bo7op2Rg/Pc8
	gHjTqHwc+Sdw9bXB52laS9P9sDY7xrkpfCMA==
X-GMX-UID:	rFMEIppzZDIrEToI52c2D7J5emhmY4F3
X-FuHaFi:	0.54
Reply-To:	djgpp-workers AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	djgpp-workers AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

-------- Original-Nachricht --------
> Datum: Thu, 11 Jun 2009 11:43:51 -0400
> Von: DJ Delorie <dj AT delorie DOT com>
> An: djgpp-workers AT delorie DOT com
> Betreff: Re: multiple definitions of _rdtsc

> 
> > -extern __inline__ unsigned long long
> > +static __inline__ unsigned long long
> 
> Are you sure about this one?  "extern inline" is supposed to provide
> an inline-able copy *without* making a real copy.


You are right.  The following will do the job.



diff -aprNU3 djgpp.orig/include/time.h djgpp/include/time.h
--- djgpp.orig/include/time.h	2007-12-11 07:01:20 +0000
+++ djgpp/include/time.h	2009-06-11 17:50:36 +0000
@@ -110,7 +110,7 @@ int		settimeofday(struct timeval *_tp, .
 void		tzsetwall(void);
 uclock_t	uclock(void);
 
-unsigned long long _rdtsc(void);
+static unsigned long long _rdtsc(void);
 
 extern __inline__ unsigned long long
 _rdtsc(void)
diff -aprNU5 djgpp.orig/include/time.h djgpp/include/time.h
--- djgpp.orig/include/time.h	2007-12-11 07:01:20 +0000
+++ djgpp/include/time.h	2009-06-11 17:50:36 +0000
@@ -108,11 +108,11 @@ unsigned long	rawclock(void);
 int		select(int _nfds, fd_set *_readfds, fd_set *_writefds, fd_set *_exceptfds, struct timeval *_timeout);
 int		settimeofday(struct timeval *_tp, ...);
 void		tzsetwall(void);
 uclock_t	uclock(void);
 
-unsigned long long _rdtsc(void);
+static unsigned long long _rdtsc(void);
 
 extern __inline__ unsigned long long
 _rdtsc(void)
 {
   unsigned long long result;
-- 
GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT!
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01

- Raw text -