Skip to content

fix: namespace mpack to avoid ODR violation #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpnurmi merged 1 commit into from
Jan 12, 2026
Merged

fix: namespace mpack to avoid ODR violation #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion third_party/mpack/README.crashpad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Description:
A C encoder/decoder for the MessagePack serialization format

Local Modifications:
Renamed mpack.c to mpack.cc.
- Renamed mpack.c to mpack.cc.
- Wrapped in crashpad namespace.
3 changes: 3 additions & 0 deletions third_party/mpack/mpack.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include "mpack.h"

namespace crashpad {

/* mpack/mpack-platform.c.c */

Expand Down Expand Up @@ -7302,3 +7303,5 @@ mpack_node_t mpack_node_map_value_at(mpack_node_t node, size_t index) {
#endif

MPACK_SILENCE_WARNINGS_END

} // namespace crashpad
6 changes: 4 additions & 2 deletions third_party/mpack/mpack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,8 +1066,8 @@ void mpack_assert_fail(const char* message);
*/

#ifdef __cplusplus
#define MPACK_EXTERN_C_BEGIN extern "C" {
#define MPACK_EXTERN_C_END }
#define MPACK_EXTERN_C_BEGIN /*nothing*/
#define MPACK_EXTERN_C_END /*nothing*/
#else
#define MPACK_EXTERN_C_BEGIN /*nothing*/
#define MPACK_EXTERN_C_END /*nothing*/
Expand Down Expand Up @@ -1173,6 +1173,7 @@ void mpack_assert_fail(const char* message);

MPACK_SILENCE_WARNINGS_BEGIN
MPACK_EXTERN_C_BEGIN
namespace crashpad {



Expand Down Expand Up @@ -8197,6 +8198,7 @@ bool mpack_node_map_contains_cstr(mpack_node_t node, const char* cstr);

#endif

} // namespace crashpad
MPACK_EXTERN_C_END
MPACK_SILENCE_WARNINGS_END

Expand Down