- non linux hosts dont really need the glob code so invert the ifdefsv0.1.11

2 files changed, 7 insertions, 19 deletions

diff --git a/porting.h b/porting.h
index f3cb0db..2b938f2 100644
--- a/porting.h
+++ b/porting.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v 1.14 2006/03/16 17:00:21 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v 1.15 2006/03/19 02:41:17 solar Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
@@ -29,20 +29,6 @@
 #include <ctype.h>
 #include <pwd.h>
 
-#ifndef HATE_GLOB
-# undef HAVE_GLOB
-# define HAVE_GLOB
-
-# include <glob.h>
-
-#ifndef __linux__
-# define glob64_t glob_t
-# define globfree64 globfree
-# define glob64 glob
-#endif
-
-#endif /* !HATE_GLOB */
-
 #include <sys/mman.h>
 #include "elf.h"
 #if defined(__linux__)
diff --git a/scanelf.c b/scanelf.c
index 495d1bb..44be18a 100644
--- a/scanelf.c
+++ b/scanelf.c
@@ -1,15 +1,17 @@
 /*
  * Copyright 2003-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.136 2006/03/17 15:27:00 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.137 2006/03/19 02:41:17 solar Exp $
  *
  * Copyright 2003-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2004-2006 Mike Frysinger  - <vapier@gentoo.org>
  */
 
 #include "paxinc.h"
-
-static const char *rcsid = "$Id: scanelf.c,v 1.136 2006/03/17 15:27:00 solar Exp $";
+#ifdef __linux__
+ #include <glob.h>
+#endif
+static const char *rcsid = "$Id: scanelf.c,v 1.137 2006/03/19 02:41:17 solar Exp $";
 #define argv0 "scanelf"
 
 #define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
@@ -1292,7 +1294,7 @@ static int load_ld_so_conf(int i, const char *fname)
 			*p = 0;
 		if ((p = strchr(path, '\n')) != NULL)
 			*p = 0;
-#ifdef HAVE_GLOB
+#ifdef __linux__
 		// recursive includes of the same file will make this segfault.
 		if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
 			glob64_t gl;