Remove ENABLE_BUFFER_LIST

it is unconditionally enabled and OpenVPN does not compile if disabled
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>

diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index 36611415a95b2f9e9ccde07bfaf63ec38264efd4..46f874b2f8dc4b8051b2b4b8d0a2dc21db9225b7 100644 (file)
--- 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 19fa1fa253ee24c935863f3fd24586028d387e67..7469da634c8e5bd30e9408e7a54992e665d763ab 100644 (file)
--- 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 22ea5a012e60ef90b83a3510f46c39cc12116fef..2967a3a7ce165356e3936a27fd836a3ebdaf4489 100644 (file)
--- 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?
  */