From 55011e5308482dfdf7708502b9a605074dcd7b07 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Thu, 1 Sep 2011 22:25:03 +0200 Subject: [PATCH] fixed bug #31809 LWIP_EVENT_API in opts.h is inconsistent compared to other options --- CHANGELOG | 4 ++++ src/include/lwip/opt.h | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 25f2ccef..0082a786 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -44,6 +44,10 @@ HISTORY ++ Bugfixes: + 2011-09-01: Simon Goldschmidt + * opt.h: fixed bug #31809 LWIP_EVENT_API in opts.h is inconsistent compared + to other options + 2011-09-01: Simon Goldschmidt * tcp_in.c: fixed bug #34111 RST for ACK to listening pcb has wrong seqno diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h index a345a149..1db77da4 100644 --- a/src/include/lwip/opt.h +++ b/src/include/lwip/opt.h @@ -1045,14 +1045,11 @@ * LWIP_EVENT_API==1: The user defines lwip_tcp_event() to receive all * events (accept, sent, etc) that happen in the system. * LWIP_CALLBACK_API==1: The PCB callback function is called directly - * for the event. + * for the event. This is the default. */ -#ifndef LWIP_EVENT_API +#if !defined(LWIP_EVENT_API) && !defined(LWIP_CALLBACK_API) #define LWIP_EVENT_API 0 #define LWIP_CALLBACK_API 1 -#else -#define LWIP_EVENT_API 1 -#define LWIP_CALLBACK_API 0 #endif