Browse Source

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
Eric Andersen 18 years ago
parent
commit
e907413137
2 changed files with 1 additions and 36 deletions
  1. 1 1
      libc/misc/glob/Makefile.in
  2. 0 35
      libc/misc/glob/glob-hooks.c

+ 1 - 1
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

+ 0 - 35
libc/misc/glob/glob-hooks.c

@@ -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);
-