Move deprecated options from opt.h to init.c

This commit is contained in:
jgrubb 2007-08-30 22:33:55 +00:00
parent 245bce04d1
commit cb399272fd
2 changed files with 19 additions and 34 deletions

View File

@ -99,7 +99,26 @@
#if (((!LWIP_DHCP) || (!LWIP_ARP)) && DHCP_DOES_ARP_CHECK)
#error "If you want to use DHCP ARP checking, you have to define LWIP_DHCP=1 and LWIP_ARP=1 in your lwipopts.h"
#endif
#if (LWIP_TCP && ((LWIP_EVENT_API && LWIP_CALLBACK_API) || (!LWIP_EVENT_API && !LWIP_CALLBACK_API)))
#error "One and exactly one of LWIP_EVENT_API and LWIP_CALLBACK_API has to be enabled in lwipopts.h"
#endif
/* Compile-time checks for deprecated options.
*/
#ifdef MEMP_NUM_TCPIP_MSG
#error MEMP_NUM_TCPIP_MSG option is deprecated. Remove it from your lwipopts.h.
#endif
#ifdef ETHARP_QUEUE_FIRST
#error ETHARP_QUEUE_FIRST option is deprecated. Remove it from your lwipopts.h.
#endif
#ifdef ETHARP_ALWAYS_INSERT
#error ETHARP_ALWAYS_INSERT option is deprecated. Remove it from your lwipopts.h.
#endif
#ifdef SO_REUSE
/* I removed the lot since this was an ugly hack. It broke the raw-API.
It also came with many ugly goto's, Christiaan Simons. */
#error "SO_REUSE currently unavailable, this was a hack"
#endif
#ifdef LWIP_DEBUG
void

View File

@ -263,13 +263,6 @@
#define MEMP_NUM_TCPIP_MSG_INPKT 8
#endif
/**
* MEMP_NUM_TCPIP_MSG is deprecated
*/
#ifdef MEMP_NUM_TCPIP_MSG
#error MEMP_NUM_TCPIP_MSG option is deprecated. Remove it from your lwipopts.h.
#endif
/**
* PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
*/
@ -316,20 +309,6 @@
#define ETHARP_TRUST_IP_MAC 1
#endif
/**
* ETHARP_QUEUE_FIRST is deprecated
*/
#ifdef ETHARP_QUEUE_FIRST
#error ETHARP_QUEUE_FIRST option is deprecated. Remove it from your lwipopts.h.
#endif
/**
* ETHARP_ALWAYS_INSERT is removed to comply with the ARP standard
*/
#ifdef ETHARP_ALWAYS_INSERT
#error ETHARP_ALWAYS_INSERT option is deprecated. Remove it from your lwipopts.h.
#endif
/*
--------------------------------
---------- IP options ----------
@ -853,19 +832,6 @@
#define LWIP_SO_RCVTIMEO 0
#endif
/**
* SO_REUSE==1: Enable SO_REUSEADDR and SO_REUSEPORT options. DO NOT USE!
*/
#ifndef SO_REUSE
#define SO_REUSE 0
#endif
#if SO_REUSE
/* I removed the lot since this was an ugly hack. It broke the raw-API.
It also came with many ugly goto's, Christiaan Simons. */
#error "SO_REUSE currently unavailable, this was a hack"
#endif
/*
----------------------------------------
---------- Statistics options ----------