From ea3f796c6cdb09d71a34e674596a5c8c66cfa36b Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Sun, 2 Dec 2007 15:26:35 +0000
Subject: [PATCH] Make unix port buildable with changes to sockets.h (include
 sys/time.h in cc.h only and define LWIP_TIMEVAL_PRIVATE to 0 in lwipopts.h to
 use unix struct timeval instead of defining an own struct)

---
 ports/unix/include/arch/sys_arch.h | 1 -
 ports/unix/proj/lib/lwipopts.h     | 3 +++
 ports/unix/proj/minimal/lwipopts.h | 3 +++
 ports/unix/proj/unixsim/lwipopts.h | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/unix/include/arch/sys_arch.h b/ports/unix/include/arch/sys_arch.h
index eb0e566..7e6a2c9 100644
--- a/ports/unix/include/arch/sys_arch.h
+++ b/ports/unix/include/arch/sys_arch.h
@@ -33,7 +33,6 @@
 #define __ARCH_SYS_ARCH_H__
 
 #include <errno.h>
-#include <sys/time.h>
 
 #define SYS_MBOX_NULL NULL
 #define SYS_SEM_NULL  NULL
diff --git a/ports/unix/proj/lib/lwipopts.h b/ports/unix/proj/lib/lwipopts.h
index d74a7ec..d48e4da 100644
--- a/ports/unix/proj/lib/lwipopts.h
+++ b/ports/unix/proj/lib/lwipopts.h
@@ -32,6 +32,9 @@
 #ifndef __LWIPOPTS_H__
 #define __LWIPOPTS_H__
 
+/* <sys/time.h> is included in cc.h! */
+#define LWIP_TIMEVAL_PRIVATE 0
+
 /* ---------- Memory options ---------- */
 /* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
    lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
diff --git a/ports/unix/proj/minimal/lwipopts.h b/ports/unix/proj/minimal/lwipopts.h
index 3d8734d..4f047b1 100644
--- a/ports/unix/proj/minimal/lwipopts.h
+++ b/ports/unix/proj/minimal/lwipopts.h
@@ -32,6 +32,9 @@
 #ifndef __LWIPOPTS_H__
 #define __LWIPOPTS_H__
 
+/* <sys/time.h> is included in cc.h! */
+#define LWIP_TIMEVAL_PRIVATE 0
+
 #define NO_SYS 1
 /* #define LWIP_EVENT_API 1 */
 
diff --git a/ports/unix/proj/unixsim/lwipopts.h b/ports/unix/proj/unixsim/lwipopts.h
index 13871cd..de374b5 100644
--- a/ports/unix/proj/unixsim/lwipopts.h
+++ b/ports/unix/proj/unixsim/lwipopts.h
@@ -31,6 +31,10 @@
  */
 #ifndef __LWIPOPTS_H__
 #define __LWIPOPTS_H__
+
+/* <sys/time.h> is included in cc.h! */
+#define LWIP_TIMEVAL_PRIVATE 0
+
 #define LWIP_DBG_MIN_LEVEL 0
 #define LWIP_COMPAT_SOCKETS 1
 #define TAPIF_DEBUG LWIP_DBG_ON