aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>1998-05-21 01:18:56 +0000
committerRichard Henderson <rth@redhat.com>1998-05-21 01:18:56 +0000
commitbde3fab6eeacba63c106df56e8f4b7ad5c8a4239 (patch)
treeb369a081a480d711c11f3e73b3736b2b3d77f3e1
parent06c1390edef0e63664fdd13437a817a9b09dc324 (diff)
downloadglibc-bde3fab6eeacba63c106df56e8f4b7ad5c8a4239.tar
glibc-bde3fab6eeacba63c106df56e8f4b7ad5c8a4239.tar.gz
glibc-bde3fab6eeacba63c106df56e8f4b7ad5c8a4239.tar.bz2
glibc-bde3fab6eeacba63c106df56e8f4b7ad5c8a4239.zip
* 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.
-rw-r--r--sysdeps/unix/sysv/linux/alpha/glob.c8
-rw-r--r--sysdeps/unix/sysv/linux/alpha/oldglob.c5
2 files changed, 7 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/glob.c b/sysdeps/unix/sysv/linux/alpha/glob.c
index 7bd516191d..59c42ae5fc 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 97284ab3e9..f405fbf2bc 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