Simplify C/C++ headers using cbindgen's cpp-compat option

README.md

@@ -168,7 +168,7 @@ The deb package will be located in `$gitroot/target/debian`
 
 ### Outputs
 
-All build outputs can be found under `target/debug`, with generated headers coming under the `includes` and `includes-cpp` directories.
+All build outputs can be found under `target/debug`, with generated headers coming under the `includes` directory.
 
 Currently the headers have to be manually generated and kept in the repo. When intentional changes are made, the testing phase verifies that the pre-generated headers match what would be generated now to ensure that accidental changes aren't made to the output of the header generation.
 

ci/before_deploy.sh

@@ -46,12 +46,10 @@ main() {
     mkdir $stage/plugins
     mkdir $stage/plugins/lib
     mkdir $stage/plugins/includes
-    mkdir $stage/plugins/includes-cpp
 
     mkdir $stage/wrapper
     mkdir $stage/wrapper/lib
     mkdir $stage/wrapper/includes
-    mkdir $stage/wrapper/includes-cpp
     mkdir $stage/wrapper/sdk
 
     # Copy Plugin items
@@ -62,11 +60,6 @@ main() {
     cp includes/plugin.h $stage/plugins/includes/
     cp includes/wooting-analog-plugin-dev.h $stage/plugins/includes/
     cp includes/wooting-analog-common.h $stage/plugins/includes/
-
-    ## Copy cpp headers
-    cp includes-cpp/wooting-analog-plugin-dev.h $stage/plugins/includes-cpp/
-    cp includes-cpp/wooting-analog-common.h $stage/plugins/includes-cpp/
-
     ## Copy docs
     cp PLUGINS.md $stage/plugins/
 
@@ -85,10 +78,6 @@ main() {
     cp includes/wooting-analog-wrapper.h $stage/wrapper/includes/
     cp includes/wooting-analog-common.h $stage/wrapper/includes/
 
-    ## Copy cpp headers
-    cp includes-cpp/wooting-analog-wrapper.h $stage/wrapper/includes-cpp/
-    cp includes-cpp/wooting-analog-common.h $stage/wrapper/includes-cpp/
-
     ## Copy docs
     cp SDK_USAGE.md $stage/wrapper/
 

includes/wooting-analog-common.h

@@ -142,6 +142,10 @@ typedef struct WootingAnalog_DeviceInfo_FFI {
   enum WootingAnalog_DeviceType device_type;
 } WootingAnalog_DeviceInfo_FFI;
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 /**
  * Create a new device info struct. This is only for use in Plugins that are written in C
  * Rust plugins should use the native constructor
@@ -159,3 +163,7 @@ struct WootingAnalog_DeviceInfo *new_device_info(uint16_t vendor_id,
  * Drops the given `DeviceInfo`
  */
 void drop_device_info(struct WootingAnalog_DeviceInfo *device);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

includes/wooting-analog-plugin-dev.h

@@ -8,6 +8,14 @@
 #include <stdlib.h>
 #include "wooting-analog-common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 WootingAnalog_DeviceID generate_device_id(const char* serial_number,
                                           uint16_t vendor_id,
                                           uint16_t product_id);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

includes/wooting-analog-wrapper.h

@@ -8,6 +8,10 @@
 #include <stdlib.h>
 #include "wooting-analog-common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 /// Initialises the Analog SDK, this needs to be successfully called before any other functions
 /// of the SDK can be called
 ///
@@ -154,3 +158,7 @@ int wooting_analog_read_full_buffer_device(unsigned short *code_buffer,
                                            float *analog_buffer,
                                            unsigned int len,
                                            WootingAnalog_DeviceID device_id);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus