3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 22:01:02 +08:00
Code Issues Projects Releases Wiki Activity

protobuf-c.{c,h}: use static empty_string on WIN32

Browse Source 
MSVC has issues importing protobuf_c_empty_string from the DLL and using
it in initializers, resulting in errors like when linking against
protobuf-c.dll:
  test-proto3.pb-c.c(13): error C2099: initializer is not a constant
  test-proto3.pb-c.c(19): error C2440: 'initializing': cannot convert from 'void *' to 'Foo__Person__PhoneType'

Work around the issue by not exporting protobuf_c_empty string and
defining it as static const char[] in the protobuf-c.h file itself. This
change only applies to _WIN32 shared library builds.
This commit is contained in:
Ilya Lipnitskiy 2021-03-13 10:12:20 -08:00
parent d9f098e3ab
commit 18ede005af
No known key found for this signature in database
GPG Key ID: 435C02AAE7CF2014
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobuf-c/protobuf-c.c
View File

@ -84,7 +84,9 @@
# define PROTOBUF_C_UNPACK_ERROR(...) # define PROTOBUF_C_UNPACK_ERROR(...)
#endif #endif
#if !defined(_WIN32) || !defined(PROTOBUF_C_USE_SHARED_LIB)
const char protobuf_c_empty_string[] = ""; const char protobuf_c_empty_string[] = "";
#endif
/** /**
* Internal `ProtobufCMessage` manipulation macro. * Internal `ProtobufCMessage` manipulation macro.

4
protobuf-c/protobuf-c.h
View File

@ -238,7 +238,11 @@ PROTOBUF_C__BEGIN_DECLS
#define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC 0x114315af #define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC 0x114315af
/* Empty string used for initializers */ /* Empty string used for initializers */
#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
static const char protobuf_c_empty_string[] = "";
#else
extern const char protobuf_c_empty_string[]; extern const char protobuf_c_empty_string[];
#endif
/** /**
* \defgroup api Public API * \defgroup api Public API