diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-07 06:59:02 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:44:42 +0100 |
| commit | 2cb22d93ae0eef86a4bcf0fe5f7fb138e43db880 (patch) | |
| tree | 3e49b118d890235da51b85a9b2175a13fa5be936 /source4/lib/replace | |
| parent | 27c9f6c235c3c625f4c4e60a73d8f2e86bd4a186 (diff) | |
| download | samba-2cb22d93ae0eef86a4bcf0fe5f7fb138e43db880.tar.gz samba-2cb22d93ae0eef86a4bcf0fe5f7fb138e43db880.tar.bz2 samba-2cb22d93ae0eef86a4bcf0fe5f7fb138e43db880.zip | |
r25892: Keep the tdb code in sync between 3.2.x and 4.0.
Add in the alarm fix to allow locks to exit on
alarm signal.
Sync up the changes in tools.
Jeremy.
(This used to be commit cb6c663fa8818f49cc36f196bb5f4dea47edd69e)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/replace.h | 4 | ||||
| -rw-r--r-- | source4/lib/replace/system/wait.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index e42d5ff168..55ed2e9570 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -452,6 +452,10 @@ typedef int bool; #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#if !defined(HAVE_VOLATILE) +#define volatile +#endif + /** this is a warning hack. The idea is to use this everywhere that we get the "discarding const" warning from gcc. That doesn't actually diff --git a/source4/lib/replace/system/wait.h b/source4/lib/replace/system/wait.h index de94cf09d5..5784b1ae92 100644 --- a/source4/lib/replace/system/wait.h +++ b/source4/lib/replace/system/wait.h @@ -48,4 +48,8 @@ #define SA_RESETHAND SA_ONESHOT #endif +#if !defined(HAVE_SIG_ATOMIC_T_TYPE) +typedef int sig_atomic_t; +#endif + #endif |