From 9dbcc84d095df1962057fd4be9c84b707921164a Mon Sep 17 00:00:00 2001 From: Pete Gould Date: Wed, 22 Jul 2020 09:30:31 +0100 Subject: [PATCH] Make c++ compliant support query --- src/fakefeed.c | 6 ++++++ src/main.c | 18 +++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/fakefeed.c b/src/fakefeed.c index 4dcc865..3b90a09 100644 --- a/src/fakefeed.c +++ b/src/fakefeed.c @@ -1,8 +1,14 @@ +#ifdef __cplusplus +extern "C"{ +#endif #include #include #include #include "fakefeed.h" +#ifdef __cplusplus +} +#endif #define arraylen(x) (sizeof(x)/sizeof(*(x))) #define itemfrom(x) x[rand()%arraylen(x)] diff --git a/src/main.c b/src/main.c index 8de60e0..bbb8634 100644 --- a/src/main.c +++ b/src/main.c @@ -11,13 +11,14 @@ // // AquaQ Analytics // kdb+ consultancy, training and support - +#ifdef __cplusplus +extern "C"{ +#endif #include #include #include #include #include - // We define two custom thread and socket types (thread_t and socket_t based on the operating // system that we are based on). #ifdef WIN32 @@ -25,21 +26,21 @@ #include #include - #define thread_t HANDLE; - #define socket_t SOCKET; + #define thread_t HANDLE + #define socket_t SOCKET #else #include #include - #define thread_t pthread_t; - #define socket_t int; + #define thread_t pthread_t + #define socket_t int #endif - #define KXVER 3 #include "k.h" #include "socketpair.h" #include "fakefeed.h" + thread_t thread; socket_t sockets[2]; @@ -233,3 +234,6 @@ K halt(K x) return (K) 0; } +#ifdef __cplusplus +} +#endif