summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-08-16 14:51:55 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-08-16 14:51:55 +0000
commit5fcc3b95dd021063e2bf2cb3e366c1c7acf9d818 (patch)
treec0eca6ad5a349d5fcb79dbf707d37c867429e7c6
parent5bf74ddf6cc3de922a1b221311f871c9409029fa (diff)
downloadmailutils-5fcc3b95dd021063e2bf2cb3e366c1c7acf9d818.tar.gz
mailutils-5fcc3b95dd021063e2bf2cb3e366c1c7acf9d818.tar.bz2
Avoid redefinition of _XOPEN_SOURCE
-rw-r--r--auth/sql.h4
-rw-r--r--mailbox/imap/folder.c2
-rw-r--r--mailbox/maildir/mbox.c4
-rw-r--r--mailbox/mbox/mbox0.h4
-rw-r--r--mailbox/mh/mbox.c4
5 files changed, 13 insertions, 5 deletions
diff --git a/auth/sql.h b/auth/sql.h
index cf5650947..a440e5035 100644
--- a/auth/sql.h
+++ b/auth/sql.h
@@ -19,7 +19,9 @@
#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
-#define _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE
+#endif
#include <unistd.h>
#include <pwd.h>
#include <errno.h>
diff --git a/mailbox/imap/folder.c b/mailbox/imap/folder.c
index 8a6b08df4..b210fd6c5 100644
--- a/mailbox/imap/folder.c
+++ b/mailbox/imap/folder.c
@@ -82,7 +82,7 @@ static struct _record _imap_record =
via the register entry/record. */
record_t imap_record = &_imap_record;
-#ifndef HAVE_DECL_STRTOK_R
+#ifndef HAVE_STRTOK_R
char *strtok_r (char *, const char *, char **);
#endif
diff --git a/mailbox/maildir/mbox.c b/mailbox/maildir/mbox.c
index ff680ab18..a3004e763 100644
--- a/mailbox/maildir/mbox.c
+++ b/mailbox/maildir/mbox.c
@@ -40,7 +40,9 @@
#ifdef WITH_PTHREAD
# ifdef HAVE_PTHREAD_H
-# define _XOPEN_SOURCE 500
+# ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500
+# endif
# include <pthread.h>
# endif
#endif
diff --git a/mailbox/mbox/mbox0.h b/mailbox/mbox/mbox0.h
index 6c41f7999..acce50850 100644
--- a/mailbox/mbox/mbox0.h
+++ b/mailbox/mbox/mbox0.h
@@ -31,7 +31,9 @@
#ifdef WITH_PTHREAD
# ifdef HAVE_PTHREAD_H
-# define _XOPEN_SOURCE 500
+# ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500
+# endif
# include <pthread.h>
# endif
#endif
diff --git a/mailbox/mh/mbox.c b/mailbox/mh/mbox.c
index 2725167e0..3e7c3b830 100644
--- a/mailbox/mh/mbox.c
+++ b/mailbox/mh/mbox.c
@@ -38,7 +38,9 @@
#ifdef WITH_PTHREAD
# ifdef HAVE_PTHREAD_H
-# define _XOPEN_SOURCE 500
+# ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500
+# endif
# include <pthread.h>
# endif
#endif

Return to:

Send suggestions and report system problems to the System administrator.