Merge remote-tracking branch 'upstream/master'

Conflicts: mbus/mbus-protocol-aux.h
2012-12-12 18:06:40 +01:00
parent 59ed4e8612 5dccbf4197
commit 746e611236
9 changed files with 46 additions and 4 deletions
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@ -67,6 +67,10 @@

 #include "mbus-protocol.h"

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MBUS_PROBE_NOTHING   0
 #define MBUS_PROBE_SINGLE    1
 #define MBUS_PROBE_COLLISION 2
@ -467,4 +471,8 @@ int mbus_scan_2nd_address_range(mbus_handle * handle, int pos, char *addr_mask);
 */
 size_t mbus_hex2bin(u_char * dst, size_t dst_len, const u_char * src, size_t src_len);

+#ifdef __cplusplus
+}
+#endif
+
 #endif // __MBUS_PROTOCOL_AUX_H__