svn merge -r 780:820 $SO/trunk/openvpn .

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@828 e7ae566f-a301-0410-adde-c780ea21d3b5

4 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e02b4d6..f12b945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@ $Id$
   on TCP client connection attempts (doesn't work on all
   OSes).  This patch also makes OpenVPN signalable during
   TCP connection attempts.
+* Fixed bug in acinclude.m4 where capability of compiler
+  to handle zero-length arrays in structs is tested
+  (David Stipp).
+* Fixed typo in manage.c where inline function declaration
+  was declared without the "static" keyword (David Stipp).
+
 2005.11.12 -- Version 2.1-beta7
 
 * Allow blank passwords to be passed via the management
@@ -22,6 +28,9 @@ $Id$
   but actually would only accept /29 or less.
 * Extend byte counters to 64 bits (M. van Cuijk).
 * PKCS#11 fixes (Alon Bar-Lev).
+
+2005.11.02 -- Version 2.0.5
+
 * Fixed bug in Linux get_default_gateway function
   introduced in 2.0.4, which would cause redirect-gateway
   on Linux clients to fail.
diff --git a/acinclude.m4 b/acinclude.m4
index 8ff8dad..f164bac 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -19,13 +19,13 @@ AC_DEFUN([AX_EMPTY_ARRAY], [
   AC_MSG_RESULT([checking for C compiler empty array support])
   AC_COMPILE_IFELSE(
     [
-        struct { int foo; int bar[0]; } mystruct;
+        struct { int foo; int bar[[0]]; } mystruct;
     ], [
         AC_DEFINE_UNQUOTED(EMPTY_ARRAY_SIZE, 0, [Dimension to use for empty array declaration])
     ], [
         AC_COMPILE_IFELSE(
 	    [
-	        struct { int foo; int bar[]; } mystruct;
+	        struct { int foo; int bar[[]]; } mystruct;
 	    ], [
                 AC_DEFINE_UNQUOTED(EMPTY_ARRAY_SIZE,, [Dimension to use for empty array declaration])
 	    ], [
diff --git a/lzo.c b/lzo.c
index 85bfea2..c16e035 100644
--- a/lzo.c
+++ b/lzo.c
@@ -78,7 +78,7 @@ lzo_adaptive_compress_test (struct lzo_adaptive_compress *ac)
   return !ac->compress_state;
 }
 
-inline static void
+static inline void
 lzo_adaptive_compress_data (struct lzo_adaptive_compress *ac, int n_total, int n_comp)
 {
   ac->n_total += n_total;
diff --git a/manage.c b/manage.c
index 6937a2c..dca5500 100644
--- a/manage.c
+++ b/manage.c
@@ -1601,7 +1601,7 @@ management_io (struct management *man)
 
 #endif
 
-inline bool
+static inline bool
 man_standalone_ok (const struct management *man)
 {
   return !man->settings.management_over_tunnel && man->connection.state != MS_INITIAL;