diff options
author | Arnon Gilboa <agilboa@redhat.com> | 2011-05-12 15:09:12 +0300 |
---|---|---|
committer | Arnon Gilboa <agilboa@redhat.com> | 2011-05-12 15:21:08 +0300 |
commit | 483d13ce611686c37d766e0a38fdf9aae1d39fe5 (patch) | |
tree | 845877ff31940affc040ce934be2116159f848b4 /common/quic_config.h | |
parent | 8776562115ab22b76e30eed3379122477ed00372 (diff) |
common: use INLINE instead of inline
needed for spice/common files used by the client, server & qxl driver.
in windows _inline works for both c/c++, while inline is c++ only.
compiling the client with mixed c/c++ code required this define.
Diffstat (limited to 'common/quic_config.h')
-rw-r--r-- | common/quic_config.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/common/quic_config.h b/common/quic_config.h index da5e51c..2a87f20 100644 --- a/common/quic_config.h +++ b/common/quic_config.h @@ -20,36 +20,26 @@ #define __QUIC_CONFIG_H #include <spice/types.h> +#include <spice/macros.h> #ifdef __cplusplus extern "C" { #endif #ifdef __GNUC__ - #include <string.h> - -#define INLINE inline - #define MEMCLEAR(ptr, size) memset(ptr, 0, size) - #else - #ifdef QXLDD #include <windef.h> #include "os_dep.h" -#define INLINE _inline #define MEMCLEAR(ptr, size) RtlZeroMemory(ptr, size) #else #include <stddef.h> #include <string.h> - -#define INLINE inline #define MEMCLEAR(ptr, size) memset(ptr, 0, size) -#endif - - -#endif +#endif // QXLDD +#endif //__GNUC__ #ifdef __cplusplus } |