Merge changes between r21352 and r21563 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@21564 7b3dc134-2b1b-0410-93df-9e9f96275f8d

6 files changed, 0 insertions, 6 deletions

diff --git a/libc/stdio-common/ctermid.c b/libc/stdio-common/ctermid.c
index b1bc4c983..e78c3d083 100644
--- a/libc/stdio-common/ctermid.c
+++ b/libc/stdio-common/ctermid.c
@@ -32,4 +32,3 @@ ctermid (s)
 
 
 stub_warning (ctermid)
-#include <stub-tag.h>
diff --git a/libc/stdio-common/cuserid.c b/libc/stdio-common/cuserid.c
index 758574b60..68056dcfc 100644
--- a/libc/stdio-common/cuserid.c
+++ b/libc/stdio-common/cuserid.c
@@ -31,4 +31,3 @@ cuserid (s)
 
 
 stub_warning (cuserid)
-#include <stub-tag.h>
diff --git a/libc/stdio-common/remove.c b/libc/stdio-common/remove.c
index 17e3ed605..8563b7187 100644
--- a/libc/stdio-common/remove.c
+++ b/libc/stdio-common/remove.c
@@ -29,4 +29,3 @@ remove (file)
 libc_hidden_def (remove)
 
 stub_warning (remove)
-#include <stub-tag.h>
diff --git a/libc/stdio-common/rename.c b/libc/stdio-common/rename.c
index af84bed00..2b3cbcfa1 100644
--- a/libc/stdio-common/rename.c
+++ b/libc/stdio-common/rename.c
@@ -37,4 +37,3 @@ rename (old, new)
 
 
 stub_warning (rename)
-#include <stub-tag.h>
diff --git a/libc/stdio-common/renameat.c b/libc/stdio-common/renameat.c
index 821e107a8..ab2cf428f 100644
--- a/libc/stdio-common/renameat.c
+++ b/libc/stdio-common/renameat.c
@@ -46,4 +46,3 @@ renameat (oldfd, old, newfd, new)
 
 
 stub_warning (renameat)
-#include <stub-tag.h>
diff --git a/libc/stdio-common/tempname.c b/libc/stdio-common/tempname.c
index cdcdaaa86..30b9fd445 100644
--- a/libc/stdio-common/tempname.c
+++ b/libc/stdio-common/tempname.c
@@ -57,4 +57,3 @@ __gen_tempname (tmpl, suffixlen, flags, kind)
 }
 
 stub_warning (__gen_tempname)
-#include <stub-tag.h>