about summary refs log tree commit diff
path: root/sysdeps/gnu
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-10-29 08:33:12 -0700
committerUlrich Drepper <drepper@redhat.com>2009-10-29 08:33:12 -0700
commit92934e8b848fd55483606addf37687913a980bca (patch)
treed2a193b39829a6b3e012c499e23183c924c3ad91 /sysdeps/gnu
parent3a85895fa3e15b8d53856161a4ba3950d44ea285 (diff)
downloadglibc-92934e8b848fd55483606addf37687913a980bca.tar.gz
glibc-92934e8b848fd55483606addf37687913a980bca.tar.xz
glibc-92934e8b848fd55483606addf37687913a980bca.zip
Allow compat handling of getutmp.
Diffstat (limited to 'sysdeps/gnu')
-rw-r--r--sysdeps/gnu/getutmp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/gnu/getutmp.c b/sysdeps/gnu/getutmp.c
index 7b6d7713ea..9647c252e2 100644
--- a/sysdeps/gnu/getutmp.c
+++ b/sysdeps/gnu/getutmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,12 @@
 #include <assert.h>
 #include <string.h>
 #include <utmp.h>
+#ifndef _UTMPX_H
 /* This is an ugly hack but we must not see the getutmpx declaration.  */
-#define getutmpx XXXgetutmpx
-#include <utmpx.h>
-#undef getutmpx
+# define getutmpx XXXgetutmpx
+# include <utmpx.h>
+# undef getutmpx
+#endif
 
 void
 getutmp (const struct utmpx *utmpx, struct utmp *utmp)