add G_BEGIN_DECLS / G_END_DECLS to all installed headers so that libsoup

2007-05-16  Jonathon Jongsma  <jjongsma@gnome.org>

	* libsoup/*.h: add G_BEGIN_DECLS / G_END_DECLS to all installed
	headers so that libsoup can be used from C++ programs. #438776

svn path=/trunk/; revision=925

diff --git a/ChangeLog b/ChangeLog
index 1125277..f7894eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-16  Jonathon Jongsma  <jjongsma@gnome.org>
+
+       * libsoup/*.h: add G_BEGIN_DECLS / G_END_DECLS to all installed
+       headers so that libsoup can be used from C++ programs. #438776
+
 2007-04-16  Dan Winship  <danw@novell.com>
 
        * libsoup/soup-ssl.h: Make a real SoupSSLCredentials type rather

diff --git a/libsoup/soup-address.h b/libsoup/soup-address.h
index aa8e245..68357b0 100644 (file)
--- a/libsoup/soup-address.h
+++ b/libsoup/soup-address.h
@@ -11,6 +11,8 @@
 #include <libsoup/soup-portability.h>
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_ADDRESS            (soup_address_get_type ())
 #define SOUP_ADDRESS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_ADDRESS, SoupAddress))
 #define SOUP_ADDRESS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_ADDRESS, SoupAddressClass))
@@ -90,4 +92,6 @@ guint            soup_address_get_port           (SoupAddress         *addr);
 struct sockaddr *soup_address_get_sockaddr       (SoupAddress         *addr,
                                                  int                 *len);
 
+G_END_DECLS
+
 #endif /* SOUP_ADDRESS_H */

diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index 098b93a..b36d5fa 100644 (file)
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -10,6 +10,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_CONNECTION            (soup_connection_get_type ())
 #define SOUP_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_CONNECTION, SoupConnection))
 #define SOUP_CONNECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_CONNECTION, SoupConnectionClass))
@@ -96,5 +98,6 @@ void            soup_connection_reauthenticate (SoupConnection   *conn,
                                                char            **username,
                                                char            **password);
 
+G_END_DECLS
 
 #endif /* SOUP_CONNECTION_H */

diff --git a/libsoup/soup-date.h b/libsoup/soup-date.h
index a72392d..29bdf48 100644 (file)
--- a/libsoup/soup-date.h
+++ b/libsoup/soup-date.h
@@ -7,6 +7,9 @@
 #define SOUP_DATE_H 1
 
 #include <time.h>
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
 
 time_t  soup_mktime_utc         (struct tm *tm);
 void    soup_gmtime             (const time_t *when, struct tm *tm);
@@ -16,4 +19,6 @@ char   *soup_date_generate      (time_t when);
 
 time_t  soup_date_iso8601_parse (const char *timestamp);
 
+G_END_DECLS
+
 #endif /* SOUP_DATE_H */

diff --git a/libsoup/soup-headers.h b/libsoup/soup-headers.h
index ea30b62..428ab94 100644 (file)
--- a/libsoup/soup-headers.h
+++ b/libsoup/soup-headers.h
@@ -9,6 +9,8 @@
 #include <glib.h>
 #include <libsoup/soup-message.h>
 
+G_BEGIN_DECLS
+
 /* HTTP Header Parsing */
 
 gboolean    soup_headers_parse_request      (const char       *str, 
@@ -41,4 +43,6 @@ char       *soup_header_param_copy_token    (GHashTable       *tokens,
 
 void        soup_header_param_destroy_hash  (GHashTable       *table);
 
+G_END_DECLS
+
 #endif /*SOUP_HEADERS_H*/

diff --git a/libsoup/soup-message-filter.h b/libsoup/soup-message-filter.h
index a5471cf..489537a 100644 (file)
--- a/libsoup/soup-message-filter.h
+++ b/libsoup/soup-message-filter.h
@@ -8,6 +8,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_MESSAGE_FILTER            (soup_message_filter_get_type ())
 #define SOUP_MESSAGE_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_MESSAGE_FILTER, SoupMessageFilter))
 #define SOUP_MESSAGE_FILTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_MESSAGE_FILTER, SoupMessageFilterClass))
@@ -27,4 +29,6 @@ GType soup_message_filter_get_type (void);
 void soup_message_filter_setup_message (SoupMessageFilter *filter,
                                        SoupMessage       *msg);
 
+G_END_DECLS
+
 #endif /* SOUP_MESSAGE_FILTER_H */

diff --git a/libsoup/soup-message-queue.h b/libsoup/soup-message-queue.h
index ed01c4e..d3b0185 100644 (file)
--- a/libsoup/soup-message-queue.h
+++ b/libsoup/soup-message-queue.h
@@ -9,6 +9,8 @@
 #include <glib.h>
 #include <libsoup/soup-message.h>
 
+G_BEGIN_DECLS
+
 typedef struct SoupMessageQueue SoupMessageQueue; 
 
 /**
@@ -41,4 +43,6 @@ void              soup_message_queue_destroy    (SoupMessageQueue     *queue);
 void              soup_message_queue_remove_message (SoupMessageQueue *queue,
                                                     SoupMessage      *msg);
 
+G_END_DECLS
+
 #endif /* SOUP_MESSAGE_QUEUE_H */

diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index 947ef1e..e048a4a 100644 (file)
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -9,6 +9,8 @@
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-method.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_MESSAGE            (soup_message_get_type ())
 #define SOUP_MESSAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_MESSAGE, SoupMessage))
 #define SOUP_MESSAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_MESSAGE, SoupMessageClass))
@@ -350,4 +352,6 @@ void soup_message_got_body            (SoupMessage *msg);
 void soup_message_restarted           (SoupMessage *msg);
 void soup_message_finished            (SoupMessage *msg);
 
+G_END_DECLS
+
 #endif /*SOUP_MESSAGE_H*/

diff --git a/libsoup/soup-method.h b/libsoup/soup-method.h
index 0d0eff2..4ef69bf 100644 (file)
--- a/libsoup/soup-method.h
+++ b/libsoup/soup-method.h
@@ -6,6 +6,10 @@
 #ifndef SOUP_METHOD_H
 #define SOUP_METHOD_H 1
 
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 #define SOUP_METHOD_POST      "POST"
 #define SOUP_METHOD_GET       "GET"
 #define SOUP_METHOD_HEAD      "HEAD"
@@ -45,4 +49,6 @@ typedef enum {
 
 SoupMethodId soup_method_get_id (const char *method);
 
+G_END_DECLS
+
 #endif /* SOUP_METHOD_H */

diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index a25cdf9..d88edae 100644 (file)
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -9,6 +9,8 @@
 #include <glib-object.h>
 #include <libxml/tree.h>
 
+G_BEGIN_DECLS
+
 #ifndef LIBSOUP_DISABLE_DEPRECATED
 /* Base64 encoding/decoding. DEPRECATED: use <glib/base64.h> */
 
@@ -73,4 +75,6 @@ xmlNode           *soup_xml_real_node        (xmlNode      *node);
  **/
 extern gboolean soup_ssl_supported;
 
+G_END_DECLS
+
 #endif /* SOUP_MISC_H */

diff --git a/libsoup/soup-server-auth.h b/libsoup/soup-server-auth.h
index a413a6a..f537e37 100644 (file)
--- a/libsoup/soup-server-auth.h
+++ b/libsoup/soup-server-auth.h
@@ -10,6 +10,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 typedef gboolean (*SoupServerAuthCallbackFn) (SoupServerAuthContext *auth_ctx,
                                              SoupServerAuth        *auth,
                                              SoupMessage           *msg, 
@@ -83,4 +85,6 @@ const gchar    *soup_server_auth_get_user     (SoupServerAuth        *auth);
 gboolean        soup_server_auth_check_passwd (SoupServerAuth        *auth,
                                               gchar                 *passwd);
 
+G_END_DECLS
+
 #endif /* SOUP_SERVER_AUTH_H */

diff --git a/libsoup/soup-server-message.h b/libsoup/soup-server-message.h
index 201b43a..cae2774 100644 (file)
--- a/libsoup/soup-server-message.h
+++ b/libsoup/soup-server-message.h
@@ -8,6 +8,8 @@
 
 #include <libsoup/soup-message.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SERVER_MESSAGE            (soup_server_message_get_type ())
 #define SOUP_SERVER_MESSAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SERVER_MESSAGE, SoupServerMessage))
 #define SOUP_SERVER_MESSAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SERVER_MESSAGE, SoupServerMessageClass))
@@ -42,6 +44,6 @@ gboolean              soup_server_message_is_started   (SoupServerMessage    *sm
 void                  soup_server_message_finish       (SoupServerMessage    *smsg);
 gboolean              soup_server_message_is_finished  (SoupServerMessage    *smsg);
 
-
+G_END_DECLS
 
 #endif /* SOUP_SERVER_H */

diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index c530a15..83cb8cc 100644 (file)
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -10,6 +10,8 @@
 #include <libsoup/soup-method.h>
 #include <libsoup/soup-uri.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SERVER            (soup_server_get_type ())
 #define SOUP_SERVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SERVER, SoupServer))
 #define SOUP_SERVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SERVER, SoupServerClass))
@@ -99,5 +101,6 @@ GSList            *soup_server_list_handlers  (SoupServer            *serv);
 SoupAddress *soup_server_context_get_client_address (SoupServerContext *ctx);
 const char  *soup_server_context_get_client_host    (SoupServerContext *ctx);
 
+G_END_DECLS
 
 #endif /* SOUP_SERVER_H */

diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index 3986865..67e72f4 100644 (file)
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -9,6 +9,8 @@
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-session.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SESSION_ASYNC            (soup_session_async_get_type ())
 #define SOUP_SESSION_ASYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_ASYNC, SoupSessionAsync))
 #define SOUP_SESSION_ASYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_ASYNC, SoupSessionAsyncClass))
@@ -32,5 +34,6 @@ SoupSession *soup_session_async_new              (void);
 SoupSession *soup_session_async_new_with_options (const char *optname1,
                                                  ...) G_GNUC_NULL_TERMINATED;
 
+G_END_DECLS
 
 #endif /* SOUP_SESSION_ASYNC_H */

diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index d7d4d82..cf478d4 100644 (file)
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -9,6 +9,8 @@
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-session.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SESSION_SYNC            (soup_session_sync_get_type ())
 #define SOUP_SESSION_SYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_SYNC, SoupSessionSync))
 #define SOUP_SESSION_SYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_SYNC, SoupSessionSyncClass))
@@ -32,5 +34,6 @@ SoupSession *soup_session_sync_new              (void);
 SoupSession *soup_session_sync_new_with_options (const char *optname1,
                                                 ...) G_GNUC_NULL_TERMINATED;
 
+G_END_DECLS
 
 #endif /* SOUP_SESSION_SYNC_H */

diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 4814deb..03b356a 100644 (file)
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -10,6 +10,8 @@
 #include <libsoup/soup-message.h>
 #include <libsoup/soup-message-queue.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SESSION            (soup_session_get_type ())
 #define SOUP_SESSION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION, SoupSession))
 #define SOUP_SESSION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION, SoupSessionClass))
@@ -83,5 +85,6 @@ SoupConnection *soup_session_get_connection       (SoupSession    *session,
                                                   gboolean       *is_new);
 gboolean        soup_session_try_prune_connection (SoupSession    *session);
 
+G_END_DECLS
 
 #endif /* SOUP_SESSION_H */

diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 72766ff..5d60080 100644 (file)
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -8,6 +8,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SOCKET            (soup_socket_get_type ())
 #define SOUP_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SOCKET, SoupSocket))
 #define SOUP_SOCKET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SOCKET, SoupSocketClass))
@@ -133,5 +135,6 @@ SoupSocketIOStatus  soup_socket_write      (SoupSocket         *sock,
                                            gsize               len,
                                            gsize              *nwrote);
 
+G_END_DECLS
 
 #endif /* SOUP_SOCKET_H */

diff --git a/libsoup/soup-status.h b/libsoup/soup-status.h
index 6b1e2ed..507d690 100644 (file)
--- a/libsoup/soup-status.h
+++ b/libsoup/soup-status.h
@@ -8,6 +8,10 @@
 #ifndef SOUP_STATUS_H
 #define SOUP_STATUS_H 1
 
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 /**
  * SoupStatusClass:
  * @SOUP_STATUS_CLASS_TRANSPORT_ERROR: Network or Soup-level error
@@ -242,4 +246,6 @@ typedef enum {
 
 const char *soup_status_get_phrase (guint status_code);
 
+G_END_DECLS
+
 #endif /* SOUP_STATUS_H */

diff --git a/libsoup/soup-types.h b/libsoup/soup-types.h
index ecd7282..fa5a400 100644 (file)
--- a/libsoup/soup-types.h
+++ b/libsoup/soup-types.h
@@ -11,6 +11,8 @@
 
 #include <libsoup/soup-status.h>
 
+G_BEGIN_DECLS
+
 typedef struct SoupAddress           SoupAddress;
 typedef struct SoupConnection        SoupConnection;
 typedef struct SoupMessage           SoupMessage;
@@ -49,4 +51,6 @@ GType type_name##_get_type(void)\
        return type;                                    \
 }
 
+G_END_DECLS
+
 #endif

diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h
index 5aad10c..c9c9e78 100644 (file)
--- a/libsoup/soup-uri.h
+++ b/libsoup/soup-uri.h
@@ -11,6 +11,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 /**
  * SoupProtocol:
  *
@@ -72,4 +74,6 @@ void      soup_uri_decode            (char          *part);
 
 gboolean  soup_uri_uses_default_port (const SoupUri *uri);
 
+G_END_DECLS
+
 #endif /*SOUP_URI_H*/

diff --git a/libsoup/soup-xmlrpc-message.h b/libsoup/soup-xmlrpc-message.h
index 96e1ce3..64cc132 100644 (file)
--- a/libsoup/soup-xmlrpc-message.h
+++ b/libsoup/soup-xmlrpc-message.h
@@ -75,4 +75,6 @@ void      soup_xmlrpc_message_persist     (SoupXmlrpcMessage *msg);
 
 SoupXmlrpcResponse *soup_xmlrpc_message_parse_response (SoupXmlrpcMessage *msg);
 
+G_END_DECLS
+
 #endif