diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-05-05 19:14:47 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-05-05 19:14:47 +0200 |
| commit | db8fd1125b2d1f8d748dc8505267f40bb49dfef8 (patch) | |
| tree | 0d47026a2e7dce7abe6b6960bc82548ba0c74cee | |
| parent | ae285d856bbf6fd485b8556dda62ee570166eb94 (diff) | |
| parent | 811ff9d449dc5dd608613f30c61e4d778059da8b (diff) | |
| download | uClibc-alpine-db8fd1125b2d1f8d748dc8505267f40bb49dfef8.tar.bz2 uClibc-alpine-db8fd1125b2d1f8d748dc8505267f40bb49dfef8.tar.xz | |
Merge branch 'nptl' of git+ssh://carmelo@git.uclibc.org/git/uClibc into nptl
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | include/stdint.h | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b86a96090 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*.os +*.oS +*.dep +*.a +*.o +*.depend +lib +.config* diff --git a/include/stdint.h b/include/stdint.h index 6d1ecbec4..465a1b5bc 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,1999,2000,2001,2006 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 @@ -309,8 +309,8 @@ typedef unsigned long long int uintmax_t; # endif /* Unsigned. */ -# define UINT8_C(c) c ## U -# define UINT16_C(c) c ## U +# define UINT8_C(c) c +# define UINT16_C(c) c # define UINT32_C(c) c ## U # if __WORDSIZE == 64 # define UINT64_C(c) c ## UL |