fix header includes

Author: DenisBiryukov91

CMakeLists.txt

@@ -133,6 +133,7 @@ function(configure_cargo_toml cargo_toml_dir CARGO_PROJECT_VERSION CARGO_LIB_NAM
 			${CMAKE_CURRENT_SOURCE_DIR}/include/zenoh.h
 			${CMAKE_CURRENT_SOURCE_DIR}/include/zenoh_memory.h
 			${CMAKE_CURRENT_SOURCE_DIR}/include/zenoh_constants.h
+			${CMAKE_CURRENT_SOURCE_DIR}/include/zenoh_def.h
 			DESTINATION ${cargo_toml_dir}/include/)
 	endif()
 	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml.in" "${cargo_toml_dir}/Cargo.toml" @ONLY)

buildrs/cbindgen_generator.rs

@@ -93,7 +93,10 @@ fn create_generics_header(path_in: &str, path_out: &str) {
         .write_all(
             "#pragma once
 // clang-format off
+#include <stdbool.h>
 
+#include \"zenoh_commons.h\"
+#include \"zenoh_opaque.h\"
 "
             .as_bytes(),
         )

buildrs/splitguide.rs

@@ -23,11 +23,9 @@ const HEADER: &str = r"//
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+
+#pragma once
 // clang-format off
-#ifdef DOCS
-#define ALIGN(n)
-#define ZENOHC_API
-#endif
 ";
 
 enum SplitRule {
@@ -568,6 +566,21 @@ impl FunctionSignature {
 }
 
 pub fn split_bindings(genetation_path: impl AsRef<Path>) -> Result<Vec<PathBuf>, String> {
+    let headers_by_file = HashMap::from([
+        (
+            "zenoh_commons.h",
+            vec![
+                "zenoh_def.h",
+                "zenoh_configure.h",
+                "zenoh_opaque.h",
+                "zenoh_includes.h",
+            ],
+        ),
+        (
+            "zenoh_opaque.h",
+            vec!["zenoh_def.h", "zenoh_configure.h", "zenoh_includes.h"],
+        ),
+    ]);
     let bindings = std::fs::read_to_string(&genetation_path).unwrap();
     let split_guide = SplitGuide::from_yaml(SPLITGUIDE_PATH);
     let mut files = split_guide
@@ -586,9 +599,17 @@ pub fn split_bindings(genetation_path: impl AsRef<Path>) -> Result<Vec<PathBuf>,
             (path as &Path, BufWriter::new(file))
         })
         .collect::<HashMap<_, _>>();
-    for file in files.values_mut() {
+    for (path, file) in files.iter_mut() {
         file.write_all(HEADER.as_bytes())
             .map_err(|e| e.to_string())?;
+        if let Some(n) = path.file_name().and_then(|p| p.to_str()) {
+            if let Some(headers) = headers_by_file.get(n) {
+                for h in headers {
+                    file.write_all(format!("#include \"{h}\"\n").as_bytes())
+                        .map_err(|e| e.to_string())?;
+                }
+            }
+        }
     }
     let mut records = group_tokens(Tokenizer {
         filename: genetation_path.as_ref(),

include/zenoh.h

@@ -10,21 +10,8 @@
 extern "C" {
 #endif
 
-#ifdef _MSC_VER
-#define ALIGN(n) __declspec(align(n))
-#else
-#define ALIGN(n) __attribute__((aligned(n)))
-#endif
-
-#if defined(ZENOHC_DYN_LIB) && defined(_MSC_VER)
-#define ZENOHC_API __declspec(dllimport)
-#else
-#define ZENOHC_API
-#endif
-
 // clang-format off
-// include order is important
-#include "zenoh_concrete.h"
+#include "zenoh_defines.h"
 #include "zenoh_opaque.h"
 #include "zenoh_commons.h"
 #include "zenoh_constants.h"

include/zenoh_commons.h

@@ -11,11 +11,13 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+
+#pragma once
 // clang-format off
-#ifdef DOCS
-#define ALIGN(n)
-#define ZENOHC_API
-#endif
+#include "zenoh_def.h"
+#include "zenoh_configure.h"
+#include "zenoh_opaque.h"
+#include "zenoh_includes.h"
 typedef enum z_congestion_control_t {
   /**
    * Messages are not dropped in case of congestion.

include/zenoh_def.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifdef DOCS
+#define ALIGN(n)
+#else
+#ifdef _MSC_VER
+#define ALIGN(n) __declspec(align(n))
+#else
+#define ALIGN(n) __attribute__((aligned(n)))
+#endif
+#endif
+
+#ifdef DOCS
+#define ZENOHC_API
+#elif defined(ZENOHC_DYN_LIB) && defined(_MSC_VER)
+#define ZENOHC_API __declspec(dllimport)
+#elif defined(_MSC_VER)
+#define ZENOHC_API
+#else
+#define ZENOHC_API __attribute__((visibility("default")))
+#endif

include/zenoh_concrete.h renamed to include/zenoh_defines.h

@@ -11,16 +11,9 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+
+#pragma once
 // clang-format off
-#ifdef DOCS
-#define ALIGN(n)
-#define ZENOHC_API
-#endif
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
 #define DEFAULT_SCOUTING_TIMEOUT 1000
 #define Z_CHANNEL_DISCONNECTED 1
 #define Z_CHANNEL_NODATA 2

include/zenoh_includes.h

@@ -0,0 +1,21 @@
+//
+// Copyright (c) 2024 ZettaScale Technology
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+//
+// Contributors:
+//   ZettaScale Zenoh Team, <[email protected]>
+//
+
+#pragma once
+// clang-format off
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>

include/zenoh_macros.h

@@ -1,6 +1,9 @@
 #pragma once
 // clang-format off
+#include <stdbool.h>
 
+#include "zenoh_commons.h"
+#include "zenoh_opaque.h"
 
 #ifndef __cplusplus
 

splitguide.yaml

@@ -3,8 +3,9 @@ zenoh_commons.h:
   - :const
   - :typedefs
   - :multiples
-zenoh_concrete.h:
+zenoh_includes.h:
   - :includes
+zenoh_defines.h:
   - :defines
 zenoh_opaque.h:
   - z_owned_bytes_t!