From ead79688da0225eca3237bc1fffce4887ce7c738 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 15 Sep 2009 05:32:49 +0000
Subject: [PATCH] =?UTF-8?q?2009-09-15=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	PR 1441/cpukit
	* libcsupport/src/tcgetprgrp.c: Remove.
	* libcsupport/src/tcgetpgrp.c: New (Renamed from
	  libcsupport/src/tcgetprgrp.c).
	* libcsupport/Makefile.am: Add libcsupport/src/tcgetpgrp.c.
	  Remove libcsupport/src/tcgetprgrp.c.
---
 cpukit/ChangeLog                                     |  9 +++++++++
 cpukit/libcsupport/Makefile.am                       |  2 +-
 cpukit/libcsupport/src/{tcgetprgrp.c => tcgetpgrp.c} | 12 +++---------
 3 files changed, 13 insertions(+), 10 deletions(-)
 rename cpukit/libcsupport/src/{tcgetprgrp.c => tcgetpgrp.c} (70%)

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 8020c42c2e..bebbcdc7df 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-15	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	PR 1441/cpukit
+	* libcsupport/src/tcgetprgrp.c: Remove.
+	* libcsupport/src/tcgetpgrp.c: New (Renamed from 
+	  libcsupport/src/tcgetprgrp.c).
+	* libcsupport/Makefile.am: Add libcsupport/src/tcgetpgrp.c.
+	  Remove libcsupport/src/tcgetprgrp.c.
+
 2009-09-15	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libcsupport/src/getpwent.c: Ansify.
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 7157526959..40c46f0847 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -50,7 +50,7 @@ BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \
 
 TERMIOS_C_FILES = src/cfgetispeed.c src/cfgetospeed.c src/cfsetispeed.c \
     src/cfsetospeed.c src/tcgetattr.c src/tcsetattr.c src/tcdrain.c \
-    src/tcflow.c src/tcflush.c src/tcgetprgrp.c src/tcsendbreak.c \
+    src/tcflow.c src/tcflush.c src/tcgetpgrp.c src/tcsendbreak.c \
     src/tcsetpgrp.c src/termios.c src/termiosinitialize.c \
     src/termios_baud2index.c src/termios_baud2num.c src/termios_num2baud.c \
     src/termios_setinitialbaud.c
diff --git a/cpukit/libcsupport/src/tcgetprgrp.c b/cpukit/libcsupport/src/tcgetpgrp.c
similarity index 70%
rename from cpukit/libcsupport/src/tcgetprgrp.c
rename to cpukit/libcsupport/src/tcgetpgrp.c
index 769883d46d..8894e46eef 100644
--- a/cpukit/libcsupport/src/tcgetprgrp.c
+++ b/cpukit/libcsupport/src/tcgetpgrp.c
@@ -15,18 +15,12 @@
 #include "config.h"
 #endif
 
-#include <rtems.h>
-#if defined(RTEMS_NEWLIB)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_TCGETPGRP)
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <termios.h>
-/* #include <sys/ioctl.h> */
+#include <unistd.h>
 
-#include <rtems/libio.h>
-
-pid_t tcgetprgrp(int fd)
+pid_t tcgetpgrp(int fd __attribute__((unused)))
 {
   return getpid();
 }