sort.h (sys/types.h): File included unconditionnaly.

	* sort.h (sys/types.h): File included unconditionnaly.
	(stddef.h): File include only #ifdef __STDC__.

	* sort.c (UCHAR_MAX): Provide fallback definition.

From-SVN: r33670

diff --git a/include/ChangeLog b/include/ChangeLog
index 1329b0fce7231654c5897fe29add6eaf1fe9eba7..f448555417e120175808cfcc9d0e8cf3570fbc2d 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  4 17:15:26 2000  Philippe De Muyter  <phdm@macqel.be>
+
+       * sort.h (sys/types.h): File included unconditionnaly.
+       (stddef.h): File include only #ifdef __STDC__.
+
 2000-05-03  Zack Weinberg  <zack@wolery.cumb.org>
 
        * symcat.h: Remove #endif label.

diff --git a/include/sort.h b/include/sort.h
index c20575707a0b9188b9a370888bb424141940ae1f..c8e1d5547d1b762771c2083afc621ecd3c01700b 100644 (file)
--- a/include/sort.h
+++ b/include/sort.h
@@ -22,7 +22,10 @@ Boston, MA 02111-1307, USA.  */
 #ifndef SORT_H
 #define SORT_H
 
+#include <sys/types.h> /* For size_t */
+#ifdef __STDC__
 #include <stddef.h>
+#endif /* __STDC__ */
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 77cbf4faa0145345687a5dd11a3a975a58ada5e9..7dc83320d23e70405817c1f28bc1ec6c400d94c1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+Thu May  4 17:14:41 2000  Philippe De Muyter  <phdm@macqel.be>
+
+       * sort.c (UCHAR_MAX): Provide fallback definition.
+
 2000-04-29  Alexandre Oliva  <aoliva@cygnus.com>
 
        * Makefile.in (maintainer-clean-subdir): Fix handling of empty

diff --git a/libiberty/sort.c b/libiberty/sort.c
index 4fd3ef9b98ee40bc5fbc22ee344bd79339d90780..b66a9e1e8567616de93511b8dec042b6c5cb1ef1 100644 (file)
--- a/libiberty/sort.c
+++ b/libiberty/sort.c
@@ -29,6 +29,10 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #endif
 
+#ifndef UCHAR_MAX
+#define UCHAR_MAX ((unsigned char)(-1))
+#endif
+
 /* POINTERS and WORK are both arrays of N pointers.  When this
    function returns POINTERS will be sorted in ascending order.  */