X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Ftiming.c;h=83f9adf8b2784040b7cb72c5f13346b402acbcd2;hb=38249b0311df91904bb3a566a770efe650f40efc;hp=6f6d9b691108a1718183e1ca03f8d1021c6d2bbd;hpb=6dec394d82d2c8bb07b31dbb79373b1a957979a1;p=libfirm

diff --git a/ir/common/timing.c b/ir/common/timing.c
index 6f6d9b691..83f9adf8b 100644
--- a/ir/common/timing.c
+++ b/ir/common/timing.c
@@ -22,11 +22,7 @@
  * @brief   platform neutral timing utilities
  * @version $Id: debug.c 17143 2008-01-02 20:56:33Z beck $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-#include "firm_config.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -70,12 +66,12 @@ typedef struct timeval ir_timer_val_t;
 
 #include <stddef.h>
 
-static INLINE void _time_get(ir_timer_val_t *val);
-static INLINE void _time_reset(ir_timer_val_t *val);
-static INLINE unsigned long _time_to_msec(const ir_timer_val_t *val);
-static INLINE ir_timer_val_t *_time_add(ir_timer_val_t *res,
+static inline void _time_get(ir_timer_val_t *val);
+static inline void _time_reset(ir_timer_val_t *val);
+static inline unsigned long _time_to_msec(const ir_timer_val_t *val);
+static inline ir_timer_val_t *_time_add(ir_timer_val_t *res,
 		const ir_timer_val_t *lhs, const ir_timer_val_t *rhs);
-static INLINE ir_timer_val_t *_time_sub(ir_timer_val_t *res,
+static inline ir_timer_val_t *_time_sub(ir_timer_val_t *res,
 		const ir_timer_val_t *lhs, const ir_timer_val_t *rhs);
 
 /**
@@ -134,36 +130,36 @@ ir_timer_t *ir_timer_register(const char *name, const char *desc)
 
 #ifdef HAVE_GETTIMEOFDAY
 
-static INLINE void _time_get(ir_timer_val_t *val)
+static inline void _time_get(ir_timer_val_t *val)
 {
 	gettimeofday(val, NULL);
 }
 
-static INLINE void _time_reset(ir_timer_val_t *val)
+static inline void _time_reset(ir_timer_val_t *val)
 {
 	timerclear(val);
 }
 
-static INLINE unsigned long _time_to_msec(const ir_timer_val_t *elapsed)
+static inline unsigned long _time_to_msec(const ir_timer_val_t *elapsed)
 {
 	return (unsigned long) elapsed->tv_sec * 1000UL
 		+ (unsigned long) elapsed->tv_usec / 1000UL;
 }
 
-static INLINE unsigned long _time_to_usec(const ir_timer_val_t *elapsed)
+static inline unsigned long _time_to_usec(const ir_timer_val_t *elapsed)
 {
 	return (unsigned long) elapsed->tv_sec * 1000000UL
 		+ (unsigned long) elapsed->tv_usec;
 }
 
-static INLINE ir_timer_val_t *_time_add(ir_timer_val_t *res,
+static inline ir_timer_val_t *_time_add(ir_timer_val_t *res,
 		const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
 {
 	timeradd(lhs, rhs, res);
 		return res;
 }
 
-static INLINE ir_timer_val_t *_time_sub(ir_timer_val_t *res,
+static inline ir_timer_val_t *_time_sub(ir_timer_val_t *res,
 		const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
 {
 	timersub(lhs, rhs, res);
@@ -172,18 +168,18 @@ static INLINE ir_timer_val_t *_time_sub(ir_timer_val_t *res,
 
 #elif defined(_WIN32)
 
-static INLINE void _time_get(ir_timer_val_t *val)
+static inline void _time_get(ir_timer_val_t *val)
 {
 	if(!QueryPerformanceCounter(&val->hi_prec))
 		val->lo_prec = timeGetTime();
 }
 
-static INLINE void _time_reset(ir_timer_val_t *val)
+static inline void _time_reset(ir_timer_val_t *val)
 {
 	memset(val, 0, sizeof(val[0]));
 }
 
-static INLINE unsigned long _time_to_msec(const ir_timer_val_t *elapsed)
+static inline unsigned long _time_to_msec(const ir_timer_val_t *elapsed)
 {
 	LARGE_INTEGER freq;
 
@@ -193,7 +189,7 @@ static INLINE unsigned long _time_to_msec(const ir_timer_val_t *elapsed)
 	return (unsigned long) ((elapsed->hi_prec.QuadPart * 1000) / freq.QuadPart);
 }
 
-static INLINE unsigned long _time_to_usec(const ir_timer_val_t *elapsed)
+static inline unsigned long _time_to_usec(const ir_timer_val_t *elapsed)
 {
 	LARGE_INTEGER freq;
 
@@ -203,7 +199,7 @@ static INLINE unsigned long _time_to_usec(const ir_timer_val_t *elapsed)
 	return (unsigned long) ((elapsed->hi_prec.QuadPart * 1000000) / freq.QuadPart);
 }
 
-static INLINE ir_timer_val_t *_time_add(ir_timer_val_t *res, const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
+static inline ir_timer_val_t *_time_add(ir_timer_val_t *res, const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
 {
 	LARGE_INTEGER dummy;
 	if(QueryPerformanceFrequency(&dummy))
@@ -214,7 +210,7 @@ static INLINE ir_timer_val_t *_time_add(ir_timer_val_t *res, const ir_timer_val_
 	return res;
 }
 
-static INLINE ir_timer_val_t *_time_sub(ir_timer_val_t *res, const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
+static inline ir_timer_val_t *_time_sub(ir_timer_val_t *res, const ir_timer_val_t *lhs, const ir_timer_val_t *rhs)
 {
 	LARGE_INTEGER dummy;
 	if(QueryPerformanceFrequency(&dummy))
@@ -227,7 +223,7 @@ static INLINE ir_timer_val_t *_time_sub(ir_timer_val_t *res, const ir_timer_val_
 
 #endif /* _WIN32 */
 
-#if _XOPEN_REALTIME != -1
+#if defined(_XOPEN_REALTIME) && _XOPEN_REALTIME != -1
 
 #include <sys/types.h>
 #include <sched.h>