diff options
Diffstat (limited to 'lib/libc/locale')
| -rw-r--r-- | lib/libc/locale/big5.c | 1 | ||||
| -rw-r--r-- | lib/libc/locale/collate.c | 5 | ||||
| -rw-r--r-- | lib/libc/locale/mskanji.c | 1 | ||||
| -rw-r--r-- | lib/libc/locale/none.c | 3 | ||||
| -rw-r--r-- | lib/libc/locale/rune.c | 6 | ||||
| -rw-r--r-- | lib/libc/locale/utf2.c | 1 |
6 files changed, 11 insertions, 6 deletions
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c index b8628ddcfd94b..dcbe168d8ebfb 100644 --- a/lib/libc/locale/big5.c +++ b/lib/libc/locale/big5.c @@ -40,7 +40,6 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include <errno.h> #include <rune.h> #include <stddef.h> #include <stdio.h> diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 373019cca40d1..13ad7706ba1b1 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -27,6 +27,7 @@ * $FreeBSD$ */ +#include "namespace.h" #include <rune.h> #include <stdio.h> #include <stdlib.h> @@ -34,6 +35,8 @@ #include <errno.h> #include <unistd.h> #include <sysexits.h> +#include "un-namespace.h" + #include "collate.h" #include "setlocale.h" @@ -46,7 +49,7 @@ struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; #define FREAD(a, b, c, d) \ do { \ - if(fread(a, b, c, d) != c) { \ + if (fread(a, b, c, d) != c) { \ fclose(d); \ return -1; \ } \ diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c index 6c3199ebbfa3b..0b6ced8d37f6d 100644 --- a/lib/libc/locale/mskanji.c +++ b/lib/libc/locale/mskanji.c @@ -39,7 +39,6 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #include <sys/types.h> -#include <errno.h> #include <rune.h> #include <stddef.h> #include <stdio.h> diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c index 41f70aef7a103..ff736ffd56057 100644 --- a/lib/libc/locale/none.c +++ b/lib/libc/locale/none.c @@ -32,6 +32,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -41,7 +43,6 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #include <stddef.h> #include <stdio.h> #include <rune.h> -#include <errno.h> #include <stdlib.h> rune_t _none_sgetrune __P((const char *, size_t, char const **)); diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c index bc4d07cf2c240..f0a54907c9174 100644 --- a/lib/libc/locale/rune.c +++ b/lib/libc/locale/rune.c @@ -32,18 +32,22 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include "namespace.h" #include <rune.h> #include <stdio.h> #include <string.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> +#include "un-namespace.h" _RuneLocale * _Read_RuneMagi(fp) @@ -56,7 +60,7 @@ _Read_RuneMagi(fp) struct stat sb; int x; - if (fstat(fileno(fp), &sb) < 0) + if (_fstat(fileno(fp), &sb) < 0) return(0); if (sb.st_size < sizeof(_RuneLocale)) diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c index 81a9412b74e21..3fbe9c504aa80 100644 --- a/lib/libc/locale/utf2.c +++ b/lib/libc/locale/utf2.c @@ -40,7 +40,6 @@ static char sccsid[] = "@(#)utf2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include <errno.h> #include <rune.h> #include <stddef.h> #include <stdio.h> |