cbindgen issues

.github/workflows/mips-unknown-linux-gnu.yml

@@ -32,7 +32,7 @@ jobs:
         shell: bash
         run: |
           ./.github/workflows/mips-unknown-linux-gnu.sh
-          cbindgen -c cbindgen.toml -l C --cpp-compat -o ./overtls.h
+          cbindgen -c cbindgen.toml -o ./overtls.h
           zip -j release/overtls-${{ matrix.target }}.zip target/${{ matrix.target }}/release/overtls-bin ./config.json ./overtls.h target/${{ matrix.target }}/release/libovertls.so
 
       - name: Upload

.github/workflows/release.yml

@@ -84,7 +84,7 @@ jobs:
             fi
           fi
 
-          cbindgen -c cbindgen.toml -l C --cpp-compat -o ./overtls.h
+          cbindgen -c cbindgen.toml -o ./overtls.h
           if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
             powershell Compress-Archive -Path target/${{ matrix.target }}/release/overtls-bin.exe, ./config.json, ./overtls.h, target/${{ matrix.target }}/release/overtls.dll -DestinationPath release/overtls-${{ matrix.target }}.zip
           elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then

build-aarch64-apple-ios-debug.sh

@@ -17,7 +17,7 @@ cargo build --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/overtls.h
+cbindgen --config cbindgen.toml -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"

build-aarch64-apple-ios.sh

@@ -17,7 +17,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 --cpp-compat -o target/include/overtls.h
+cbindgen --config cbindgen.toml -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"

build-android.sh

@@ -113,7 +113,7 @@ function build_android() {
         cp $BASE/target/$target/${mode2}/lib${name}.a $android_libs/${target_dir}/lib${name}.a
     done
 
-    cbindgen -c $BASE/cbindgen.toml -l C --cpp-compat -o $android_libs/$name.h
+    cbindgen -c $BASE/cbindgen.toml -o $android_libs/$name.h
 }
 
 function main() {

build-apple.sh

@@ -31,7 +31,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 --cpp-compat -o target/include/overtls.h
+cbindgen --config cbindgen.toml -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"

cbindgen.toml

@@ -1,3 +1,6 @@
+language = "C"
+cpp_compat = true
+
 [export]
 include = [
     "over_tls_client_run",