1 files changed, 12 insertions, 2 deletions
diff --git a/src/resolver.h b/src/resolver.h
index e5ad0675..af14f5f2 100644
--- a/src/resolver.h
+++ b/src/resolver.h
@@ -20,18 +20,24 @@
 #ifndef MPD_RESOLVER_H
 #define MPD_RESOLVER_H
 
+#include "gcc.h"
+
 #include <glib.h>
 
 struct sockaddr;
 struct addrinfo;
 
-G_GNUC_CONST
+gcc_const
 static inline GQuark
 resolver_quark(void)
 {
 	return g_quark_from_static_string("resolver");
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Converts the specified socket address into a string in the form
  * "IP:PORT".  The return value must be freed with g_free() when you
@@ -42,7 +48,7 @@ resolver_quark(void)
  * @param error location to store the error occurring, or NULL to
  * ignore errors
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
 sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error);
 
@@ -61,4 +67,8 @@ resolve_host_port(const char *host_port, unsigned default_port,
 		  int flags, int socktype,
 		  GError **error_r);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif