apr_arch_atomic.h (apr-1.6.5.tar.bz2) | : | apr_arch_atomic.h (apr-1.7.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 21 | skipping to change at line 21 | |||
* distributed under the License is distributed on an "AS IS" BASIS, | * distributed under the License is distributed on an "AS IS" BASIS, | |||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
* See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | |||
* limitations under the License. | * limitations under the License. | |||
*/ | */ | |||
#ifndef ATOMIC_H | #ifndef ATOMIC_H | |||
#define ATOMIC_H | #define ATOMIC_H | |||
#include "apr.h" | #include "apr.h" | |||
#include "apr_pools.h" | ||||
#include "apr_private.h" | #include "apr_private.h" | |||
#include "apr_atomic.h" | #include "apr_atomic.h" | |||
#include "apr_thread_mutex.h" | ||||
#if defined(USE_ATOMICS_GENERIC) | #if defined(USE_ATOMICS_GENERIC) | |||
/* noop */ | /* noop */ | |||
#elif defined(__GNUC__) && defined(__STRICT_ANSI__) | ||||
/* force use of generic atomics if building e.g. with -std=c89, which | ||||
* doesn't allow inline asm */ | ||||
# define USE_ATOMICS_GENERIC | ||||
#elif HAVE_ATOMIC_BUILTINS | #elif HAVE_ATOMIC_BUILTINS | |||
# define USE_ATOMICS_BUILTINS | # define USE_ATOMICS_BUILTINS | |||
#elif defined(SOLARIS2) && SOLARIS2 >= 10 | #elif defined(SOLARIS2) && SOLARIS2 >= 10 | |||
# define USE_ATOMICS_SOLARIS | # define USE_ATOMICS_SOLARIS | |||
# define NEED_ATOMICS_GENERIC64 | ||||
#elif defined(__GNUC__) && defined(__STRICT_ANSI__) | ||||
/* force use of generic atomics if building e.g. with -std=c89, which | ||||
* doesn't allow inline asm */ | ||||
# define USE_ATOMICS_GENERIC | ||||
#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) | #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) | |||
# define USE_ATOMICS_IA32 | # define USE_ATOMICS_IA32 | |||
# define NEED_ATOMICS_GENERIC64 | ||||
#elif defined(__GNUC__) && (defined(__PPC__) || defined(__ppc__)) | #elif defined(__GNUC__) && (defined(__PPC__) || defined(__ppc__)) | |||
# define USE_ATOMICS_PPC | # define USE_ATOMICS_PPC | |||
# define NEED_ATOMICS_GENERIC64 | ||||
#elif defined(__GNUC__) && (defined(__s390__) || defined(__s390x__)) | #elif defined(__GNUC__) && (defined(__s390__) || defined(__s390x__)) | |||
# define USE_ATOMICS_S390 | # define USE_ATOMICS_S390 | |||
# define NEED_ATOMICS_GENERIC64 | ||||
#else | #else | |||
# define USE_ATOMICS_GENERIC | # define USE_ATOMICS_GENERIC | |||
#endif | #endif | |||
#if defined(USE_ATOMICS_GENERIC) || defined (NEED_ATOMICS_GENERIC64) | ||||
apr_status_t apr__atomic_generic64_init(apr_pool_t *p); | ||||
#endif | ||||
#endif /* ATOMIC_H */ | #endif /* ATOMIC_H */ | |||
End of changes. 8 change blocks. | ||||
5 lines changed or deleted | 13 lines changed or added |