summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-07-13 17:06:43 +0000
committerEric Andersen <andersen@codepoet.org>2006-07-13 17:06:43 +0000
commite907413137f5026a5c3b9bddb3f80771f928eb41 (patch)
treedb5db39860ffba1c56dc1d833a5d2e2fe8692e34 /libc
parenta2a3c80101de57f0276c63d97bcff4f7f40d4ad3 (diff)
psm writes:
forgotten to mention to remove glob-hooks.c and the reference in Makefile.in (the prototypes for the 3 hooks were already removed by the patch applied here) Peter
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/glob/Makefile.in2
-rw-r--r--libc/misc/glob/glob-hooks.c35
2 files changed, 1 insertions, 36 deletions
diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in
index 5fc913265..93367f41b 100644
--- a/libc/misc/glob/Makefile.in
+++ b/libc/misc/glob/Makefile.in
@@ -6,7 +6,7 @@
#
ifeq ($(UCLIBC_HAS_GNU_GLOB),y)
-CSRC := glob.c glob-hooks.c
+CSRC := glob.c
ifeq ($(UCLIBC_HAS_LFS),y)
CSRC += glob64.c
endif
diff --git a/libc/misc/glob/glob-hooks.c b/libc/misc/glob/glob-hooks.c
deleted file mode 100644
index e3529181f..000000000
--- a/libc/misc/glob/glob-hooks.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
- *
- * modified for uClibc by Erik Andersen <andersen@codepoet.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <malloc.h>
-#include <fnmatch.h>
-#include <glob.h>
-
-
-attribute_hidden __ptr_t (*__glob_opendir_hook) (const char *directory);
-attribute_hidden const char *(*__glob_readdir_hook) (__ptr_t stream);
-attribute_hidden void (*__glob_closedir_hook) (__ptr_t stream);
-