diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a19367f6fc6..94c84647a6a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-01  Pedro Alves  <palves@redhat.com>
+
+	* utils.c <pathconf/_PC_PATH_MAX use>: Check if _PC_PATH_MAX is
+	defined instead of checking HAVE_UNISTD_H.
+
 2013-07-01  Pedro Alves  <palves@redhat.com>
 
 	Reimport gnulib from scratch.
diff --git a/gdb/utils.c b/gdb/utils.c
index f5c133974fb..a2015a8401c 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3179,7 +3179,7 @@ gdb_realpath (const char *filename)
      pathconf()) making it impossible to pass a correctly sized buffer
      to realpath() (it could always overflow).  On those systems, we
      skip this.  */
-#if defined (HAVE_REALPATH) && defined (HAVE_UNISTD_H) && defined(HAVE_ALLOCA)
+#if defined (HAVE_REALPATH) && defined (_PC_PATH_MAX) && defined(HAVE_ALLOCA)
   {
     /* Find out the max path size.  */
     long path_max = pathconf ("/", _PC_PATH_MAX);