From: Richard Henderson <rth@redhat.com>
Date: Thu, 21 May 1998 01:18:56 +0000 (+0000)
Subject:         * sysdeps/unix/sysv/linux/alpha/glob.c: Include sysdeps/generic/glob.c
X-Git-Tag: glibc-2.16-ports-merge^2~3229
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bde3fab6eeacba63c106df56e8f4b7ad5c8a4239;p=platform%2Fupstream%2Fglibc.git

    * sysdeps/unix/sysv/linux/alpha/glob.c: Include sysdeps/generic/glob.c
        directly instead of include_next.  Add missing semicolons.
        * sysdeps/unix/sysv/linux/alpha/oldglob.c: Include sys/types.h.
        Add missing semicolons.
---

diff --git a/sysdeps/unix/sysv/linux/alpha/glob.c b/sysdeps/unix/sysv/linux/alpha/glob.c
index 7bd5161..59c42ae 100644
--- a/sysdeps/unix/sysv/linux/alpha/glob.c
+++ b/sysdeps/unix/sysv/linux/alpha/glob.c
@@ -17,14 +17,14 @@
 
 /* For Linux/Alpha we have to make the glob symbols versioned.  */
 #define glob(pattern, flags, errfunc, pglob) \
-  __new_glob (pattern, flags, errfunc, pglob) \
+  __new_glob (pattern, flags, errfunc, pglob)
 #define globfree(pglob) \
   __new_globfree (pglob)
 
-#include_next <glob.c>
+#include <sysdeps/generic/glob.c>
 
 #undef glob
 #undef globfree
 
-default_symbol_version(__new_glob, glob, GLIBC_2.1)
-default_symbol_version(__new_globfree, globfree, GLIBC_2.1)
+default_symbol_version(__new_glob, glob, GLIBC_2.1);
+default_symbol_version(__new_globfree, globfree, GLIBC_2.1);
diff --git a/sysdeps/unix/sysv/linux/alpha/oldglob.c b/sysdeps/unix/sysv/linux/alpha/oldglob.c
index 97284ab..f405fbf 100644
--- a/sysdeps/unix/sysv/linux/alpha/oldglob.c
+++ b/sysdeps/unix/sysv/linux/alpha/oldglob.c
@@ -17,6 +17,7 @@
 
 /* This file contains only wrappers around the real glob functions.  It
    became necessary since the glob_t structure changed.  */
+#include <sys/types.h>
 #include <glob.h>
 
 #if defined PIC && DO_VERSIONING
@@ -74,7 +75,7 @@ __old_glob (const char *pattern, int flags,
 
   return result;
 }
-symbol_version(__old_glob, glob, GLIBC_2.0)
+symbol_version(__old_glob, glob, GLIBC_2.0);
 
 
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
@@ -89,6 +90,6 @@ __old_globfree (old_glob_t *pglob)
 
   globfree (&correct);
 }
-symbol_version(__old_globfree, globfree, GLIBC_2.0)
+symbol_version(__old_globfree, globfree, GLIBC_2.0);
 
 #endif