diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
| commit | 0d02cb10e8dd8639b86450cf8e597cf5e2e09894 (patch) | |
| tree | 0f2174db43a501b946f0600d1b91ae4117977b04 /include/bits | |
| parent | dfbbe67270efa9c03f9444d50d2f98a7a64622b4 (diff) | |
| parent | 88ea382fda5af7717f85bb19837c9c99094f3df4 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
ChangeLog
sysdeps/unix/sysv/linux/i386/sysconf.c
sysdeps/x86_64/cacheinfo.c
version.h
Diffstat (limited to 'include/bits')
| -rw-r--r-- | include/bits/setjmp2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bits/setjmp2.h b/include/bits/setjmp2.h new file mode 100644 index 0000000000..bdb222cd2c --- /dev/null +++ b/include/bits/setjmp2.h @@ -0,0 +1 @@ +#include <setjmp/bits/setjmp2.h> |