summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-08-01 00:08:31 +0000
committerRoland McGrath <roland@gnu.org>1996-08-01 00:08:31 +0000
commit9ebb936d991a6e08da05e5a942465d64cac39f86 (patch)
tree6eb10ee37a5b428f49e57c55a393567e3e5e42df
parent033badd4fa8b32d9592aeef68c3f3ee7be27d19e (diff)
Wed Jul 31 14:21:36 1996 Ulrich Drepper <drepper@cygnus.com>cvs/libc-960801
* termios/termios.h [__OPTIMIZE__]: Remove "optimization" for tcgetattr. We have weak aliases now. * stdlib/stdlib.h [__OPTIMIZE__ && __GNUC__ >= 2]: Remove "optimizations" for random functions.
-rw-r--r--ChangeLog7
-rw-r--r--stdlib/stdlib.h22
-rw-r--r--termios/termios.h4
3 files changed, 13 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 95c3d890ad..cb64fc043e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 31 14:21:36 1996 Ulrich Drepper <drepper@cygnus.com>
+
+ * termios/termios.h [__OPTIMIZE__]: Remove "optimization" for
+ tcgetattr. We have weak aliases now.
+ * stdlib/stdlib.h [__OPTIMIZE__ && __GNUC__ >= 2]: Remove
+ "optimizations" for random functions.
+
Mon Jul 29 20:33:42 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/netinet/in.h (ntohl, ntohs, htonl,
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index ae1507eae5..7da32b91e1 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -214,8 +214,11 @@ extern void srand __P ((unsigned int __seed));
We provide both interfaces to the same random number generator. */
/* Return a random long integer between 0 and RAND_MAX inclusive. */
extern int32_t __random __P ((void));
+extern int32_t random __P ((void));
+
/* Seed the random number generator with the given number. */
extern void __srandom __P ((unsigned int __seed));
+extern void srandom __P ((unsigned int __seed));
/* Initialize the random number generator to use state buffer STATEBUF,
of length STATELEN, and seed it with SEED. Optimal lengths are 8, 16,
@@ -223,27 +226,14 @@ extern void __srandom __P ((unsigned int __seed));
cause an error and values greater than 256 will be rounded down. */
extern __ptr_t __initstate __P ((unsigned int __seed, __ptr_t __statebuf,
size_t __statelen));
+extern __ptr_t initstate __P ((unsigned int __seed, __ptr_t __statebuf,
+ size_t __statelen));
+
/* Switch the random number generator to state buffer STATEBUF,
which should have been previously initialized by `initstate'. */
extern __ptr_t __setstate __P ((__ptr_t __statebuf));
-
-extern int32_t random __P ((void));
-extern void srandom __P ((unsigned int __seed));
-extern __ptr_t initstate __P ((unsigned int __seed, __ptr_t __statebuf,
- size_t __statelen));
extern __ptr_t setstate __P ((__ptr_t __statebuf));
-#if defined (__OPTIMIZE__) && __GNUC__ >= 2
-extern __inline int32_t random (void)
-{ return __random(); }
-extern __inline void srandom (unsigned int __seed)
-{ __srandom(__seed); }
-extern __inline __ptr_t initstate (unsigned int __seed,
- __ptr_t __statebuf, size_t __statelen)
-{ return __initstate (__seed, __statebuf, __statelen); }
-extern __inline __ptr_t setstate (__ptr_t __statebuf)
-{ return __setstate (__statebuf); }
-#endif /* Optimizing GCC >=2. */
#ifdef __USE_REENTRANT
/* Reentrant versions of the `random' family of functions.
diff --git a/termios/termios.h b/termios/termios.h
index a2937bdee1..9943fa6ff6 100644
--- a/termios/termios.h
+++ b/termios/termios.h
@@ -59,10 +59,6 @@ extern void cfsetspeed __P ((struct termios *__termios_p, speed_t __speed));
extern int __tcgetattr __P ((int __fd, struct termios *__termios_p));
extern int tcgetattr __P ((int __fd, struct termios *__termios_p));
-#ifdef __OPTIMIZE__
-#define tcgetattr(fd, termios_p) __tcgetattr((fd), (termios_p))
-#endif /* Optimizing. */
-
/* Set the state of FD to *TERMIOS_P.
Values for OPTIONAL_ACTIONS (TCSA*) are in <termbits.h>. */
extern int tcsetattr __P ((int __fd, int __optional_actions,