summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-18 18:50:37 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-18 18:50:37 +0200
commit2c5221ef7a503ddfffa0d3b3209b3c2eda30b555 (patch)
tree4b36f7634b795ac6e31e20c24c59704765f69d97
parent2243479b7415942604284028cd34a20aa0ba79c0 (diff)
downloadsamba-2c5221ef7a503ddfffa0d3b3209b3c2eda30b555.tar.gz
samba-2c5221ef7a503ddfffa0d3b3209b3c2eda30b555.tar.bz2
samba-2c5221ef7a503ddfffa0d3b3209b3c2eda30b555.zip
Use attr.h rather than having local defines for GCC attributes.
-rw-r--r--source3/include/includes.h19
1 files changed, 6 insertions, 13 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9594393474..2ba6c4478e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -593,6 +593,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
/* Lists, trees, caching, database... */
#include "../lib/util/xfile.h"
#include "../lib/util/memory.h"
+#include "../lib/util/attr.h"
#include "intl.h"
#include "../lib/util/dlinklist.h"
#include "tdb.h"
@@ -1107,19 +1108,11 @@ ssize_t readahead(int fd, off64_t offset, size_t count);
#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
#define CONST_ADD(type, ptr) ((type) ((const void *) (ptr)))
-#ifndef NORETURN_ATTRIBUTE
-#if (__GNUC__ >= 3)
-#define NORETURN_ATTRIBUTE __attribute__ ((noreturn))
-#else
-#define NORETURN_ATTRIBUTE
-#endif
-#endif
-
-void smb_panic( const char *why ) NORETURN_ATTRIBUTE ;
-void dump_core(void) NORETURN_ATTRIBUTE ;
-void exit_server(const char *const reason) NORETURN_ATTRIBUTE ;
-void exit_server_cleanly(const char *const reason) NORETURN_ATTRIBUTE ;
-void exit_server_fault(void) NORETURN_ATTRIBUTE ;
+void smb_panic( const char *why ) _NORETURN_;
+void dump_core(void) _NORETURN_;
+void exit_server(const char *const reason) _NORETURN_;
+void exit_server_cleanly(const char *const reason) _NORETURN_;
+void exit_server_fault(void) _NORETURN_;
#ifdef HAVE_LIBNSCD
#include "libnscd.h"