--- a/packages/net/lwip_tcpip/current/ChangeLog
+++ b/packages/net/lwip_tcpip/current/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-08  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/lwip_net.cdl: Require CYGPKG_ISOINFRA.
+	* include/arch/cc.h: Define ERRNO if CYGINT_ISO_ERRNO is
+	implemented. Based on patch from Will Wagner. [ Bugzilla 1001169 ]
+
 2011-01-30  Ilija Kocho  <ilijak@siva.com.mk>
 
 	* cdl/lwip_net.cdl: New CDL option CYGSEM_LWIP_MEM_SECTION.
@@ -239,7 +245,7 @@ 2004-05-04  Jani Monoses <jani@iv.ro>
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 2004, 2010 Free Software Foundation 
+// Copyright (C) 2004, 2010, 2011 Free Software Foundation 
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free

--- a/packages/net/lwip_tcpip/current/cdl/lwip_net.cdl
+++ b/packages/net/lwip_tcpip/current/cdl/lwip_net.cdl
@@ -8,7 +8,7 @@
 #####ECOSGPLCOPYRIGHTBEGIN####
 ## -------------------------------------------
 ## This file is part of eCos, the Embedded Configurable Operating System.
-## Copyright (C) 2008, 2009, 2010 Free Software Foundation
+## Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -48,6 +48,7 @@
 cdl_package CYGPKG_NET_LWIP {
     display         "lwIP networking stack"
     description     "The lightweight TCP/IP stack."
+    requires        CYGPKG_ISOINFRA
     requires        CYGINT_ISO_ERRNO_CODES
 	
     compile         core/dns.c                  \

--- a/packages/net/lwip_tcpip/current/include/arch/cc.h
+++ b/packages/net/lwip_tcpip/current/include/arch/cc.h
@@ -2,7 +2,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 2008 Free Software Foundation
+// Copyright (C) 2008, 2011 Free Software Foundation
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -34,7 +34,7 @@
 #define __LWIP_ARCH_CC_H__
 
 #include <string.h>
-#include <cyg/error/codes.h>
+#include <errno.h>
 #include <cyg/infra/cyg_type.h>
 
 typedef int sys_prot_t;
@@ -47,6 +47,11 @@ typedef int sys_prot_t;
 #define ETIME           62
 #define ENSRNOTFOUND    163
 
+// If errno support, define ERRNO used in api/sockets.c
+#if CYGINT_ISO_ERRNO > 0
+#define ERRNO
+#endif
+
 // Platform byteorder
 #if (CYG_BYTEORDER == CYG_LSBFIRST)
 #define BYTE_ORDER LITTLE_ENDIAN