mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
Remove define for VOLATILE, volatile is already provided by libreplace.
This commit is contained in:
parent
efdc503440
commit
d4f647c859
@ -285,25 +285,15 @@ typedef int ber_int_t;
|
||||
#define HAVE_ADS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define VOLATILE if needed.
|
||||
*/
|
||||
|
||||
#if defined(HAVE_VOLATILE)
|
||||
#define VOLATILE volatile
|
||||
#else
|
||||
#define VOLATILE
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define additional missing types
|
||||
*/
|
||||
#if defined(HAVE_SIG_ATOMIC_T_TYPE) && defined(AIX)
|
||||
typedef sig_atomic_t SIG_ATOMIC_T;
|
||||
#elif defined(HAVE_SIG_ATOMIC_T_TYPE) && !defined(AIX)
|
||||
typedef sig_atomic_t VOLATILE SIG_ATOMIC_T;
|
||||
typedef sig_atomic_t volatile SIG_ATOMIC_T;
|
||||
#else
|
||||
typedef int VOLATILE SIG_ATOMIC_T;
|
||||
typedef int volatile SIG_ATOMIC_T;
|
||||
#endif
|
||||
|
||||
#ifndef uchar
|
||||
|
@ -32,7 +32,6 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NS_API_H
|
||||
#undef VOLATILE
|
||||
#undef STATIC
|
||||
#undef DYNAMIC
|
||||
#include <ns_daemon.h>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
#include "includes.h"
|
||||
#ifdef HAVE_NS_API_H
|
||||
#undef VOLATILE
|
||||
|
||||
#include <ns_daemon.h>
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user