diff options
| author | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
| commit | 65f0aab98b20b5994a726ab90d355248bcddfffd (patch) | |
| tree | 2b7c0cf831d8255e3b0d1bab367609100a7e0f18 /lib/blkid/cache.c | |
| parent | 66b7b06812cc7ae835e0c0ed2656d1a27580c5ed (diff) | |
| download | android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.gz android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.bz2 android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.zip | |
Revert changes that moved from 1.41.14 to 1.42.9
Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
commit e80e74c41d85ff93f3d212ba6512340f48054a93.
Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
This reverts commit e97b2b6fc82f840e84dfc631b87f21be44ff2421, reversing
changes made to 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Revert "Prepare for upstream 1.42.9"
This reverts commit 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Bug: 13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'lib/blkid/cache.c')
| -rw-r--r-- | lib/blkid/cache.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c index e2ccafd2..2b818868 100644 --- a/lib/blkid/cache.c +++ b/lib/blkid/cache.c @@ -10,9 +10,6 @@ * %End-Header% */ -#if HAVE_SECURE_GETENV -#define _GNU_SOURCE -#endif #if HAVE_UNISTD_H #include <unistd.h> #endif @@ -51,9 +48,7 @@ static char *safe_getenv(const char *arg) #endif #endif -#if defined(HAVE_SECURE_GETENV) - return secure_getenv(arg); -#elif defined(HAVE___SECURE_GETENV) +#ifdef HAVE___SECURE_GETENV return __secure_getenv(arg); #else return getenv(arg); |