mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
* sysdeps/unix/sysv/linux/alpha/ipc_priv.h: Renamed to ...
* sysdeps/unix/sysv/linux/powerpc/ipc_priv.h: ... here. * sysdeps/unix/sysv/linux/alpha/wordexp.c: Renamed to ... * sysdeps/unix/sysv/linux/ia64/wordexp.c: ... here. * sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c: Change #include.
This commit is contained in:
parent
01a746457f
commit
24fd0a5bec
@ -1,5 +1,12 @@
|
||||
2008-11-26 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/ipc_priv.h: Renamed to ...
|
||||
* sysdeps/unix/sysv/linux/powerpc/ipc_priv.h: ... here.
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/wordexp.c: Renamed to ...
|
||||
* sysdeps/unix/sysv/linux/ia64/wordexp.c: ... here.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c: Change #include.
|
||||
|
||||
* elf/elf.h (NT_386_IOPERM): New macro.
|
||||
(NT_PPC_VSX): New macro.
|
||||
|
||||
|
@ -1 +1,60 @@
|
||||
#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>
|
||||
/* Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <shlib-compat.h>
|
||||
|
||||
/* For Linux/Alpha we have to make the wordexp symbols versioned. */
|
||||
#define wordexp(words, pwordexp, flags) \
|
||||
__new_wordexp (words, pwordexp, flags)
|
||||
|
||||
#include <posix/wordexp.c>
|
||||
|
||||
versioned_symbol (libc, __new_wordexp, wordexp, GLIBC_2_2_2);
|
||||
|
||||
|
||||
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2_2)
|
||||
/* The old, incorrect wordexp_t definition. */
|
||||
typedef struct
|
||||
{
|
||||
int we_wordc; /* Count of words matched. */
|
||||
char **we_wordv; /* List of expanded words. */
|
||||
int we_offs; /* Slots to reserve in `we_wordv'. */
|
||||
} old_wordexp_t;
|
||||
|
||||
|
||||
int
|
||||
attribute_compat_text_section
|
||||
__old_wordexp (const char *words, old_wordexp_t *pwordexp, int flags)
|
||||
{
|
||||
wordexp_t we;
|
||||
int result;
|
||||
|
||||
we.we_wordc = pwordexp->we_wordc;
|
||||
we.we_wordv = pwordexp->we_wordv;
|
||||
we.we_offs = pwordexp->we_offs;
|
||||
|
||||
result = __new_wordexp (words, &we, flags);
|
||||
|
||||
pwordexp->we_wordc = we.we_wordc;
|
||||
pwordexp->we_wordv = we.we_wordv;
|
||||
pwordexp->we_offs = we.we_offs;
|
||||
|
||||
return result;
|
||||
}
|
||||
compat_symbol (libc, __old_wordexp, wordexp, GLIBC_2_1);
|
||||
#endif
|
||||
|
@ -1 +1 @@
|
||||
#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>
|
||||
#include <sysdeps/unix/sysv/linux/ia64/wordexp.c>
|
||||
|
Loading…
Reference in New Issue
Block a user