haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-08-28 17:00:35 +00:00
Code Issues Releases Wiki Activity

Wrap public declarations with G_BEGIN_DECLS/G_END_DECLS

Browse Source 
Glib release 2.67.3 started conditionally using some C++ code[1] in the
public headers and it's no longer legal to include "glib.h" or anything
that includes it transitively from `extern "C"` block.

The solution recommended by the glib developers is to enclose all
declarations in a header within G_BEGIN_DECLS and G_END_DECLS as shown
in gobject developer manual[2].

[1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
[2] https://developer.gnome.org/gobject/stable/howto-gobject.html#howto-gobject-header
This commit is contained in:
Aleksei Bavshin 2021-02-12 08:58:26 +00:00
parent e889dbcb50
commit 36d75a8efe
No known key found for this signature in database
GPG Key ID: 4F071603387A382A
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/searpc-client.h
View File

@ -15,6 +15,8 @@
#define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN) #define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN)
#endif #endif
G_BEGIN_DECLS
typedef char *(*TransportCB)(void *arg, const gchar *fcall_str, typedef char *(*TransportCB)(void *arg, const gchar *fcall_str,
size_t fcall_len, size_t *ret_len); size_t fcall_len, size_t *ret_len);
@ -137,5 +139,6 @@ searpc_client_generic_callback (char *retstr, size_t len,
#define TRANSPORT_ERROR "Transport Error" #define TRANSPORT_ERROR "Transport Error"
#define TRANSPORT_ERROR_CODE 500 #define TRANSPORT_ERROR_CODE 500
G_END_DECLS
#endif #endif

4
lib/searpc-named-pipe-transport.h
View File

@ -16,6 +16,8 @@
#include <windows.h> #include <windows.h>
#endif #endif
G_BEGIN_DECLS
// Implementatin of a searpc transport based on named pipe. It uses unix domain // Implementatin of a searpc transport based on named pipe. It uses unix domain
// sockets on linux/osx, and named pipes on windows. // sockets on linux/osx, and named pipes on windows.
// //
@ -72,4 +74,6 @@ int searpc_named_pipe_client_connect(SearpcNamedPipeClient *client);
LIBSEARPC_API LIBSEARPC_API
void searpc_free_client_with_pipe_transport (SearpcClient *client); void searpc_free_client_with_pipe_transport (SearpcClient *client);
G_END_DECLS
#endif // SEARPC_NAMED_PIPE_TRANSPORT_H #endif // SEARPC_NAMED_PIPE_TRANSPORT_H

4
lib/searpc-server.h
View File

@ -15,6 +15,8 @@
#define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN) #define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN)
#endif #endif
G_BEGIN_DECLS
typedef gchar* (*SearpcMarshalFunc) (void *func, json_t *param_array, typedef gchar* (*SearpcMarshalFunc) (void *func, json_t *param_array,
gsize *ret_len); gsize *ret_len);
typedef void (*RegisterMarshalFunc) (void); typedef void (*RegisterMarshalFunc) (void);
@ -134,4 +136,6 @@ gchar *searpc_server_call_function (const char *service,
LIBSEARPC_API LIBSEARPC_API
char* searpc_compute_signature (const gchar *ret_type, int pnum, ...); char* searpc_compute_signature (const gchar *ret_type, int pnum, ...);
G_END_DECLS
#endif #endif

4
lib/searpc-utils.h
View File

@ -10,6 +10,8 @@
#define SEARPC_JSON_DOMAIN g_quark_from_string("SEARPC_JSON") #define SEARPC_JSON_DOMAIN g_quark_from_string("SEARPC_JSON")
G_BEGIN_DECLS
typedef enum { typedef enum {
SEARPC_JSON_ERROR_LOAD, SEARPC_JSON_ERROR_LOAD,
SEARPC_JSON_ERROR_PACK, SEARPC_JSON_ERROR_PACK,
@ -80,3 +82,5 @@ inline static void json_array_add_json_or_null_element (json_t *array, const jso
json_array_append_new (array, json_null ()); json_array_append_new (array, json_null ());
} }
} }
G_END_DECLS