merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 683df3f8e666e59dc9c45040069355c286d5527a..569a25ff5ac10e77e82131405b415bce82571a98 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-28  Mark Kettenis  <kettenis@gnu.org>
+       
+       * unlink-if-ordinary.c: Include <sys/types.h>.
+
 2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        Convert libiberty to use ISO C prototype style 7/n.

diff --git a/libiberty/unlink-if-ordinary.c b/libiberty/unlink-if-ordinary.c
index a389ad4e3dc013449abb7f7431982b3dcac54dc1..1f21806b8a65eff91501eb839c53ccc98d11050b 100644 (file)
--- a/libiberty/unlink-if-ordinary.c
+++ b/libiberty/unlink-if-ordinary.c
@@ -1,5 +1,5 @@
 /* unlink-if-ordinary.c - remove link to a file unless it is special
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of the libiberty library.  This library is free
 software; you can redistribute it and/or modify it under the
@@ -39,6 +39,8 @@ was made to unlink the file because it is special.
 #include "config.h"
 #endif
 
+#include <sys/types.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif