diff --git a/flake.lock b/flake.lock index e72553e..a17aaeb 100644 --- a/flake.lock +++ b/flake.lock @@ -1348,11 +1348,11 @@ "rust-rapidsnark": "rust-rapidsnark" }, "locked": { - "lastModified": 1782142589, - "narHash": "sha256-K5NtBontpPx1XqnX6jbEzPXSchaLbPlG9689W+C/ExA=", + "lastModified": 1782200713, + "narHash": "sha256-5nA3rAiK0957Enbx7femzpZwhB7pZ4u7Sdx/GFAt8kE=", "ref": "erhant/fix-indexer-ffi", - "rev": "2a78b1b3d1b4080930c00ecf23b5c0e73cd646b8", - "revCount": 2773, + "rev": "30ed55717e33d9b28addc231d1a399789657f982", + "revCount": 2774, "type": "git", "url": "https://github.com/logos-blockchain/logos-execution-zone" }, diff --git a/src/lez_ffi_marshalling.h b/src/lez_ffi_marshalling.h index 33d4312..0a52f01 100644 --- a/src/lez_ffi_marshalling.h +++ b/src/lez_ffi_marshalling.h @@ -1,6 +1,6 @@ #pragma once -#include "lez_indexer_ffi.h" +#include #include #include diff --git a/src/lez_indexer_ffi.h b/src/lez_indexer_ffi.h deleted file mode 100644 index 8f13ee0..0000000 --- a/src/lez_indexer_ffi.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -// The generated indexer_ffi.h is a plain C header with no `extern "C"` guard of -// its own, so a C++ translation unit including it directly would name-mangle the -// FFI declarations and fail to link against the C-ABI symbols in libindexer_ffi. -// This wrapper provides the `extern "C"` linkage behind a single include point; -// both lez_indexer_module_impl.cpp and lez_ffi_marshalling include THIS header, -// not directly. -#ifdef __cplusplus -extern "C" { -#endif -#include -#ifdef __cplusplus -} -#endif diff --git a/src/lez_indexer_module_impl.cpp b/src/lez_indexer_module_impl.cpp index 547afcc..78ff5c9 100644 --- a/src/lez_indexer_module_impl.cpp +++ b/src/lez_indexer_module_impl.cpp @@ -1,7 +1,7 @@ #include "lez_indexer_module_impl.h" #include "lez_ffi_marshalling.h" -#include "lez_indexer_ffi.h" +#include #include #include