several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h" if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h.

CHANGELOG

@@ -373,6 +373,12 @@ HISTORY
 
   ++ Bug fixes:
 
+  2007-09-06 Frédéric Bernon
+  * several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove
+    it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which
+    already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h"
+    if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h.
+
   2007-08-30 Frédéric Bernon
   * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, 
     and fix some coding style.

src/core/snmp/mib2.c

@@ -35,10 +35,10 @@
  * Author: Christiaan Simons <christiaan.simons@axon.tv>
  */
 
-#include "arch/cc.h"
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
+
 #include "lwip/snmp.h"
 #include "lwip/netif.h"
 #include "netif/etharp.h"

src/core/snmp/msg_in.c

@@ -35,8 +35,8 @@
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
+
 #include <string.h>
-#include "arch/cc.h"
 #include "lwip/ip_addr.h"
 #include "lwip/mem.h"
 #include "lwip/udp.h"

src/core/snmp/msg_out.c

@@ -45,7 +45,7 @@
 #include "lwip/opt.h"
 
 #if LWIP_SNMP
-#include "arch/cc.h"
+
 #include "lwip/udp.h"
 #include "lwip/netif.h"
 

src/include/lwip/debug.h

@@ -32,7 +32,7 @@
 #ifndef __LWIP_DEBUG_H__
 #define __LWIP_DEBUG_H__
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 /** lower two bits indicate debug level
  * - 0 off

src/include/lwip/def.h

@@ -33,7 +33,7 @@
 #define __LWIP_DEF_H__
 
 /* this might define NULL already */
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 #define LWIP_MAX(x , y)  (((x) > (y)) ? (x) : (y))
 #define LWIP_MIN(x , y)  (((x) < (y)) ? (x) : (y))

src/include/lwip/err.h

@@ -34,8 +34,6 @@
 
 #include "lwip/opt.h"
 
-#include "arch/cc.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/include/lwip/pbuf.h

@@ -33,7 +33,7 @@
 #ifndef __LWIP_PBUF_H__
 #define __LWIP_PBUF_H__
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 #include "lwip/err.h"
 
 #ifdef __cplusplus

src/include/lwip/sio.h

@@ -32,7 +32,7 @@
  * It needs to be implemented by those platforms which need SLIP or PPP
  */
 
-#include "arch/cc.h"
+#include "lwip/arch.h"
 
 #ifdef __cplusplus
 extern "C" {

src/include/lwip/snmp_asn1.h

@@ -36,7 +36,6 @@
 #define __LWIP_SNMP_ASN1_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 #include "lwip/err.h"
 #include "lwip/pbuf.h"
 #include "lwip/snmp.h"

src/include/lwip/snmp_msg.h

@@ -36,7 +36,6 @@
 #define __LWIP_SNMP_MSG_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 #include "lwip/snmp.h"
 #include "lwip/snmp_structs.h"
 

src/include/lwip/snmp_structs.h

@@ -40,7 +40,6 @@
 #include "lwip/opt.h"
 #if LWIP_SNMP
 
-#include "arch/cc.h"
 #include "lwip/snmp.h"
 
 #if SNMP_PRIVATE_MIB

src/include/lwip/stats.h

@@ -33,7 +33,6 @@
 #define __LWIP_STATS_H__
 
 #include "lwip/opt.h"
-#include "arch/cc.h"
 
 #include "lwip/mem.h"
 #include "lwip/memp.h"

src/include/lwip/sys.h

@@ -32,8 +32,6 @@
 #ifndef __LWIP_SYS_H__
 #define __LWIP_SYS_H__
 
-#include "arch/cc.h"
-
 #include "lwip/opt.h"
 
 #ifdef __cplusplus