summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-05-05 01:03:57 +0200
committerAndreas Gruenbacher <agruen@suse.de>2010-05-05 01:03:57 +0200
commit5b68db86ce6365e4d08b144a75b5a9341c5d42d2 (patch)
treeaf00ba3926eadb9464b702d5f7cba7270869f0e5
parenta78d3c405b8c65caa847d98dff71584b6e20203c (diff)
downloadpatch-5b68db86ce6365e4d08b144a75b5a9341c5d42d2.tar.gz
Use the gnulib unistd module
* bootstrap.conf: Use the gnulib unistd module.
-rw-r--r--ChangeLog2
-rw-r--r--bootstrap.conf1
-rw-r--r--src/common.h21
3 files changed, 5 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b2afd7..63babae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-05-05 Andreas Gruenbacher <agruen@suse.de>
+ * bootstrap.conf: Use the gnulib unistd module.
+
* bootstrap.conf: Use the gnulib mkdir module.
* m4/mkdir.m4: Delete.
diff --git a/bootstrap.conf b/bootstrap.conf
index 846d1ef..28169cf 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -52,6 +52,7 @@ stdlib
symlink
sys_stat
time
+unistd
unlink
utimens
xalloc
diff --git a/src/common.h b/src/common.h
index 3aaebe8..b38f1b2 100644
--- a/src/common.h
+++ b/src/common.h
@@ -151,26 +151,8 @@ extern int errno;
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#else
-# ifndef lseek
- off_t lseek ();
-# endif
-#endif
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
#if HAVE_FSEEKO
typedef off_t file_offset;
# define file_seek fseeko
@@ -180,6 +162,7 @@ extern int errno;
# define file_seek fseek
# define file_tell ftell
#endif
+
#if ! (HAVE_GETEUID || defined geteuid)
# if ! (HAVE_GETUID || defined getuid)
# define geteuid() (-1)