From: Arne Schwabe Date: Mon, 7 Jul 2014 12:12:22 +0000 (+0200) Subject: Remove ENABLE_BUFFER_LIST X-Git-Tag: v2.4_alpha1~395 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c21b2dba9fca5f3e7effc45a495be1f5a9d0246;p=thirdparty%2Fopenvpn.git Remove ENABLE_BUFFER_LIST it is unconditionally enabled and OpenVPN does not compile if disabled Acked-by: Gert Doering Message-Id: <1404735142-31420-4-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8841 Signed-off-by: Gert Doering --- diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 36611415a..46f874b2f 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -976,9 +976,6 @@ valign4 (const struct buffer *buf, const char *file, const int line) /* * struct buffer_list */ - -#ifdef ENABLE_BUFFER_LIST - struct buffer_list * buffer_list_new (const int max_size) { @@ -1154,5 +1151,3 @@ buffer_list_file (const char *fn, int max_line_len) } return bl; } - -#endif diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h index 19fa1fa25..7469da634 100644 --- a/src/openvpn/buffer.h +++ b/src/openvpn/buffer.h @@ -904,9 +904,6 @@ check_malloc_return (void *p) /* * Manage lists of buffers */ - -#ifdef ENABLE_BUFFER_LIST - struct buffer_entry { struct buffer buf; @@ -936,7 +933,4 @@ void buffer_list_pop (struct buffer_list *ol); void buffer_list_aggregate (struct buffer_list *bl, const size_t max); struct buffer_list *buffer_list_file (const char *fn, int max_line_len); - -#endif - #endif /* BUFFER_H */ diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 22ea5a012..2967a3a7c 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -593,11 +593,6 @@ socket_defined (const socket_descriptor_t sd) #define UNIX_SOCK_SUPPORT 0 #endif -/* - * Compile the struct buffer_list code - */ -#define ENABLE_BUFFER_LIST - /* * Should we include OCC (options consistency check) code? */