From a37c2a26f5a639e3ffc5b30c3b1c0422814a4b38 Mon Sep 17 00:00:00 2001
From: schulz <schulz@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 12 May 2013 19:55:27 +0000
Subject: [PATCH] better way to prevent struct timeval redefinition.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@47400 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 arch/all-linux/hidd/linuxfb/startup.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/all-linux/hidd/linuxfb/startup.c b/arch/all-linux/hidd/linuxfb/startup.c
index 91931c6bc6..4ead0926bb 100644
--- a/arch/all-linux/hidd/linuxfb/startup.c
+++ b/arch/all-linux/hidd/linuxfb/startup.c
@@ -15,12 +15,6 @@
  * open etc.
  */
 
-#include <sys/stat.h>
-#include <fcntl.h>
-
-/* Prevent 'timeval redefinition' error */
-#define _AROS_TYPES_TIMEVAL_S_H_
-
 #include <aros/debug.h>
 #include <aros/symbolsets.h>
 #include <graphics/gfxbase.h>
@@ -31,6 +25,14 @@
 
 #include LC_LIBDEFS_FILE
 
+/* Prevent redefinition of struct timeval */
+#define timeval sys_timeval
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#undef timeval
+
 #undef LSD
 #define LSD(cl) (&LIBBASE->lsd)
 
-- 
2.11.4.GIT