aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-06 22:07:28 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-06 22:07:28 +0000
commitdf4ef2ab9c0899b2670067cd97e58f7eb2913e00 (patch)
tree4cb343b5ba9ccdc9c0b96144412567b6a4eda0ee /libio
parent6f9e7002f38ae778b3ff2f586a3e5766382228e9 (diff)
downloadglibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.zip
glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.gz
glibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.bz2
update from main archive 960105cvs/libc-970107cvs/libc-970106
Diffstat (limited to 'libio')
-rw-r--r--libio/_G_config.h1
-rw-r--r--libio/fcloseall.c6
-rw-r--r--libio/genops.c2
-rw-r--r--libio/stdfiles.c6
4 files changed, 7 insertions, 8 deletions
diff --git a/libio/_G_config.h b/libio/_G_config.h
index 5fa7300..4b47e88 100644
--- a/libio/_G_config.h
+++ b/libio/_G_config.h
@@ -33,6 +33,7 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
#define _G_HAVE_PRINTF_FP 1
#define _G_HAVE_MMAP 1
+#define _G_HAVE_LONG_DOUBLE_IO 1
/* This is defined by <statbuf.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
diff --git a/libio/fcloseall.c b/libio/fcloseall.c
index 56233b0..05693f3 100644
--- a/libio/fcloseall.c
+++ b/libio/fcloseall.c
@@ -1,5 +1,5 @@
/*
-Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU IO Library. This library is free
software; you can redistribute it and/or modify it under the
@@ -23,9 +23,7 @@ This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
#include "libioP.h"
-#ifdef __STDC__
-#include <stdlib.h>
-#endif
+#include <stdio.h>
int
__fcloseall ()
diff --git a/libio/genops.c b/libio/genops.c
index 3267aa3..e57328d 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -466,7 +466,7 @@ DEFUN(_IO_init, (fp, flags),
fp->_markers = NULL;
fp->_cur_column = 0;
#ifdef _IO_MTSAFE_IO
- _IO_lock_init_recursive (*fp->_lock);
+ _IO_lock_init (*fp->_lock);
#endif
}
diff --git a/libio/stdfiles.c b/libio/stdfiles.c
index c50d5f1..7c6f789 100644
--- a/libio/stdfiles.c
+++ b/libio/stdfiles.c
@@ -1,5 +1,5 @@
-/*
-Copyright (C) 1993, 1994 Free Software Foundation
+/*
+Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation
This file is part of the GNU IO Library. This library is free
software; you can redistribute it and/or modify it under the
@@ -33,7 +33,7 @@ the executable file might be covered by the GNU General Public License. */
#ifdef _IO_MTSAFE_IO
#define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
- static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_init; \
+ static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \
struct _IO_FILE_plus NAME \
= {FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps}
#else