From d062b1b66a6e27b88372a4ebc70c0a26fe4d808f Mon Sep 17 00:00:00 2001
From: ssrlive <30760636+ssrlive@users.noreply.github.com>
Date: Thu, 23 May 2024 21:27:42 +0800
Subject: [PATCH] Fix #115

---
 .github/workflows/publish-exe.yml | 2 +-
 build-aarch64-apple-ios-debug.sh  | 2 +-
 build-aarch64-apple-ios.sh        | 2 +-
 build-android.sh                  | 2 +-
 build-apple.sh                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-exe.yml b/.github/workflows/publish-exe.yml
index 898c3ee..6b89324 100644
--- a/.github/workflows/publish-exe.yml
+++ b/.github/workflows/publish-exe.yml
@@ -63,7 +63,7 @@ jobs:
           else
             cargo build --all-features --release --target ${{ matrix.target }}
           fi
-          cbindgen --config cbindgen.toml -l C -o target/tun2proxy-ffi.h
+          cbindgen --config cbindgen.toml -l C --cpp-compat -o target/tun2proxy-ffi.h
           if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
             powershell -Command "(Get-Item README.md).LastWriteTime = Get-Date"
             powershell -Command "(Get-Item target/${{ matrix.target }}/release/wintun.dll).LastWriteTime = Get-Date"
diff --git a/build-aarch64-apple-ios-debug.sh b/build-aarch64-apple-ios-debug.sh
index 538865b..9a740d4 100755
--- a/build-aarch64-apple-ios-debug.sh
+++ b/build-aarch64-apple-ios-debug.sh
@@ -10,7 +10,7 @@ cargo build --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/tun2proxy.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/tun2proxy.h
 cat > target/include/tun2proxy.modulemap <<EOF
 framework module tun2proxy {
     umbrella header "tun2proxy.h"
diff --git a/build-aarch64-apple-ios.sh b/build-aarch64-apple-ios.sh
index b7163ff..17f1cde 100755
--- a/build-aarch64-apple-ios.sh
+++ b/build-aarch64-apple-ios.sh
@@ -10,7 +10,7 @@ cargo build --release --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/tun2proxy.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/tun2proxy.h
 cat > target/include/tun2proxy.modulemap <<EOF
 framework module tun2proxy {
     umbrella header "tun2proxy.h"
diff --git a/build-android.sh b/build-android.sh
index fd1ed13..13cb969 100755
--- a/build-android.sh
+++ b/build-android.sh
@@ -92,7 +92,7 @@ function build_android() {
         cp $BASE/target/$target/${mode2}/lib${name}.so $android_libs/${target_dir}/lib${name}.so
     done
 
-    cbindgen -c $BASE/cbindgen.toml -l C -o $android_libs/$name.h
+    cbindgen -c $BASE/cbindgen.toml -l C --cpp-compat -o $android_libs/$name.h
 }
 
 function main() {
diff --git a/build-apple.sh b/build-apple.sh
index 4df4623..5bf2732 100755
--- a/build-apple.sh
+++ b/build-apple.sh
@@ -24,7 +24,7 @@ cargo build --release --target aarch64-apple-ios-sim
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/tun2proxy.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/tun2proxy.h
 cat > target/include/tun2proxy.modulemap <<EOF
 framework module tun2proxy {
     umbrella header "tun2proxy.h"