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

1 files changed, 1 insertions, 1 deletions

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;