generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 19:25:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #529 from mbodmer/master

Browse Source 
Fixing building with gcc_atomic.hpp
This commit is contained in:
Takatoshi Kondo
2016-10-10 19:59:27 +09:00
committed by GitHub
parent 98820ec6c7 e7eae65ab7
commit 2a7335ae90
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/msgpack/gcc_atomic.hpp
View File

@@ -11,7 +11,7 @@
#ifndef MSGPACK_GCC_ATOMIC_HPP #ifndef MSGPACK_GCC_ATOMIC_HPP
#define MSGPACK_GCC_ATOMIC_HPP #define MSGPACK_GCC_ATOMIC_HPP
#ifdef ENABLE_GCC_CXX_ATOMIC #ifdef MSGPACK_ENABLE_GCC_CXX_ATOMIC
#if defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41) #if defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
#include "msgpack/gcc_atomic.h" #include "msgpack/gcc_atomic.h"
@@ -28,6 +28,6 @@ int _msgpack_sync_incr_and_fetch(volatile _msgpack_atomic_counter_t* ptr)
} }
#endif // old gcc workaround #endif // old gcc workaround
#endif // ENABLE_GCC_CXX_ATOMIC #endif // MSGPACK_ENABLE_GCC_CXX_ATOMIC
#endif /* gcc_atomic.hpp */ #endif /* gcc_atomic.hpp */

4
include/msgpack/sysdep.h
View File

@@ -51,9 +51,9 @@
#elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41) #elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
# if defined(__cplusplus) # if defined(__cplusplus)
# define _msgpack_atomic_counter_header "gcc_atomic.hpp" # define _msgpack_atomic_counter_header "msgpack/gcc_atomic.hpp"
# else # else
# define _msgpack_atomic_counter_header "gcc_atomic.h" # define _msgpack_atomic_counter_header "msgpack/gcc_atomic.h"
# endif # endif
#else #else