New upstream version 4.12upstream/4.12

2 files changed, 19 insertions, 1 deletions

diff --git a/include/libHX/libxml_helper.h b/include/libHX/libxml_helper.h
index ebe5613..08a0a07 100644
--- a/include/libHX/libxml_helper.h
+++ b/include/libHX/libxml_helper.h
@@ -7,6 +7,7 @@
 #	include <string.h>
 #endif
 #include <libxml/parser.h>
+#include <libHX/defs.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,6 +31,10 @@ static __inline__ int xml_strcasecmp(const xmlChar *a, const char *b)
 #endif
 }
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 static __inline__ char *xml_getprop(xmlNode *node, const char *attr)
 {
 #ifdef __cplusplus
@@ -106,7 +111,15 @@ xml_setprop(xmlNode *node, const char *name, const char *value)
 }
 
 #ifdef __cplusplus
-} /* extern "C" */
+static __inline__ const char *xml_getprop(const xmlNode *node, const char *attr)
+{
+	return xml_getprop(const_cast<xmlNode *>(node), attr);
+}
+static __inline__ char *xml_getnsprop(const xmlNode *node, const char *nsprefix,
+    const char *attr)
+{
+	return xml_getnsprop(const_cast<const xmlNode *>(node), nsprefix, attr);
+}
 #endif
 
 #endif /* _LIBHX_LIBXML_HELPER_H */
diff --git a/include/libHX/socket.h b/include/libHX/socket.h
index e9db77f..e34e1c8 100644
--- a/include/libHX/socket.h
+++ b/include/libHX/socket.h
@@ -1,6 +1,7 @@
 #ifndef _LIBHX_SOCKET_H
 #define _LIBHX_SOCKET_H 1
 
+#include <stdint.h>
 #ifdef _WIN32
 #	include <ws2tcpip.h>
 #else
@@ -12,6 +13,10 @@
 extern "C" {
 #endif
 
+extern int HX_addrport_split(const char *spec, char *host, size_t hsize, uint16_t *port);
+extern int HX_inet_connect(const char *host, uint16_t port, unsigned int oflags);
+extern int HX_inet_listen(const char *host, uint16_t port);
+extern int HX_local_listen(const char *path);
 extern int HX_socket_from_env(const struct addrinfo *, const char *intf);
 extern int HX_sockaddr_is_local(const struct sockaddr *, socklen_t, unsigned int flags);
 extern int HX_ipaddr_is_local(const char *, unsigned int flags);