sync our cryptplug.h with the version in KDE/libkdenetwork/ that was corrected my...

diff --git a/trunk/gpgmeplug/cryptplug.h b/trunk/gpgmeplug/cryptplug.h
index 026be5e8b844488bad73585c78d44c9d54ea2e55..f45fed9e821d1fa5953bb82a9a1a8f996ed0871a 100644 (file)
--- a/trunk/gpgmeplug/cryptplug.h
+++ b/trunk/gpgmeplug/cryptplug.h
@@ -23,6 +23,8 @@
 #ifndef CRYPTPLUG_H
 #define CRYPTPLUG_H
 
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #else
@@ -31,8 +33,6 @@ typedef char bool;
 #define false 0
 #endif
 
-#include <stdlib.h>
-
 /*! \file cryptplug.h
     \brief Common API header for CRYPTPLUG.
 
@@ -1324,7 +1324,7 @@ struct StructuringInfo {
     \see free_StructuringInfo, StructuringInfo
     \see signMessage, encryptMessage, encryptAndSignMessage
 */
-  static void init_StructuringInfo( struct StructuringInfo* s )
+  inline void init_StructuringInfo( struct StructuringInfo* s )
   {
     if( ! s ) return;
 
@@ -1365,7 +1365,7 @@ struct StructuringInfo {
 
     \see StructuringInfo
 */
-  static void free_StructuringInfo( struct StructuringInfo* s )
+  inline void free_StructuringInfo( struct StructuringInfo* s )
   {
     if( ! s ) return;
     if( s->contentTypeMain )    free( s->contentTypeMain );