2007-08-10 H.J. Lu <hongjiu.lu@intel.com>

	PR ld/4875
	* elf-hints-local.h: Include bfd_stdint.h.  Use uint32_t
	instead of u_int32_t.

	* sha1.h: Include bfd_stdint.h instead of <stdint.h>.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 11de68ad1ef813d64c81126c415c022bca6ae031..db7013921053e46c5b9fd9d9e6449599ad951e86 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/4875
+       * elf-hints-local.h: Include bfd_stdint.h.  Use uint32_t
+       instead of u_int32_t.
+
+       * sha1.h: Include bfd_stdint.h instead of <stdint.h>.
+
 2007-08-09  Alan Modra  <amodra@bigpond.net.au>
 
        PR 4515

diff --git a/ld/elf-hints-local.h b/ld/elf-hints-local.h
index 69408180ce4a903f2c038b14f8bd977c21574f88..67fcb5ca992ea17463b5a926ab7e85ca6f81cbc3 100644 (file)
--- a/ld/elf-hints-local.h
+++ b/ld/elf-hints-local.h
@@ -25,16 +25,18 @@
 #ifndef        _ELF_HINTS_H_
 #define        _ELF_HINTS_H_
 
+#include "bfd_stdint.h"
+
 /* Hints file produced by ldconfig.  */
 struct elfhints_hdr
 {
-  u_int32_t magic;             /* Magic number.  */
-  u_int32_t version;           /* File version (1).  */
-  u_int32_t strtab;            /* Offset of string table in file.  */
-  u_int32_t strsize;           /* Size of string table.  */
-  u_int32_t dirlist;           /* Offset of directory list in string table.  */
-  u_int32_t dirlistlen;                /* strlen(dirlist).  */
-  u_int32_t spare[26];         /* Room for expansion.  */
+  uint32_t magic;              /* Magic number.  */
+  uint32_t version;            /* File version (1).  */
+  uint32_t strtab;             /* Offset of string table in file.  */
+  uint32_t strsize;            /* Size of string table.  */
+  uint32_t dirlist;            /* Offset of directory list in string table.  */
+  uint32_t dirlistlen;         /* strlen(dirlist).  */
+  uint32_t spare[26];          /* Room for expansion.  */
 };
 
 #define ELFHINTS_MAGIC 0x746e6845

diff --git a/ld/sha1.h b/ld/sha1.h
index 43b6dde9a9a74d212c8a1479f32b8d08805ef944..f271de912a0a7d3690a3a680749ef1a5a6dd01dd 100644 (file)
--- a/ld/sha1.h
+++ b/ld/sha1.h
@@ -22,7 +22,7 @@
 #define SHA1_H 1
 
 #include <stdio.h>
-#include <stdint.h>
+#include "bfd_stdint.h"
 
 /* Structure to save state of computation between the single steps.  */
 struct sha1_ctx