From: Jim Meyering <jim@meyering.net>
Date: Fri, 6 Jun 2003 21:01:52 +0000 (+0000)
Subject: #undef rename before defining rpl_rename.
X-Git-Tag: v5.0.1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8023d768a48ffd45eacaa512b0a15af2135755b;p=thirdparty%2Fcoreutils.git

#undef rename before defining rpl_rename.
[HAVE_CONFIG_H]: Guard inclusion of config.h.
---

diff --git a/lib/rename.c b/lib/rename.c
index 70ff13018b..4a4c165b2c 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,7 +1,7 @@
 /* Work around the bug in some systems whereby rename fails when the source
    path has a trailing slash.  The rename functions of SunOS 4.1.1_U1 and
    mips-dec-ultrix4.4 have this bug.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,11 @@
 
 /* written by Volker Borchert */
 
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef rename
+
 #include <stdio.h>
 #if HAVE_STDLIB_H
 # include <stdlib.h>