Whitespace cleanup.

* configure.in: Eliminate subdir stuff.
* configure: Regenerate.
* include/getopt.h (option): Make name field 'const'.

7 files changed, 43 insertions, 49 deletions

diff --git a/winsup/cygwin/include/sys/copying.dj b/winsup/cygwin/include/sys/copying.dj
index 7d048f70d..b6d105976 100644
--- a/winsup/cygwin/include/sys/copying.dj
+++ b/winsup/cygwin/include/sys/copying.dj
@@ -1,5 +1,5 @@
 This is the file "copying.dj".  It does not apply to any sources
-copyrighted by UCB Berkeley or the Free Software Foundation. 
+copyrighted by UCB Berkeley or the Free Software Foundation.
 
    Copyright Information for sources and executables that are marked
    Copyright (C) DJ Delorie
@@ -14,18 +14,18 @@ GNU General Public Licence, with the following exceptions:
 
 * Any existing copyright or authorship information in any given source
 file must remain intact.  If you modify a source file, a notice to that
-effect must be added to the authorship information in the source file. 
+effect must be added to the authorship information in the source file.
 
 * binaries provided in djgpp may be distributed without sources ONLY if
 the recipient is given sufficient information to obtain a copy of djgpp
 themselves.  This primarily applies to go32.exe, emu387, stub.exe, and
-the graphics drivers. 
+the graphics drivers.
 
 * modified versions of the binaries provided in djgpp must be
-distributed under the terms of the GPL. 
+distributed under the terms of the GPL.
 
 * objects and libraries linked into an application may be distributed
-without sources. 
+without sources.
 
 -----
 
diff --git a/winsup/cygwin/include/sys/mtio.h b/winsup/cygwin/include/sys/mtio.h
index e21e4fff5..af75e40b2 100644
--- a/winsup/cygwin/include/sys/mtio.h
+++ b/winsup/cygwin/include/sys/mtio.h
@@ -1,7 +1,4 @@
-/* 
- * sys/mtio.h header file for Cygwin.
- *
- */
+/* sys/mtio.h header file for Cygwin.  */
 
 #ifndef _SYS_MTIO_H
 #define _SYS_MTIO_H
diff --git a/winsup/cygwin/include/sys/procfs.h b/winsup/cygwin/include/sys/procfs.h
index e30da5dc0..9b601b377 100644
--- a/winsup/cygwin/include/sys/procfs.h
+++ b/winsup/cygwin/include/sys/procfs.h
@@ -1,7 +1,4 @@
-/* 
- * sys/procfs.h header file for Cygwin.
- *
- */
+/* sys/procfs.h header file for Cygwin.  */
 
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H
diff --git a/winsup/cygwin/include/sys/resource.h b/winsup/cygwin/include/sys/resource.h
index 42907bc7b..a709ec00f 100644
--- a/winsup/cygwin/include/sys/resource.h
+++ b/winsup/cygwin/include/sys/resource.h
@@ -11,7 +11,7 @@ extern "C" {
 #define	RUSAGE_CHILDREN	-1		/* terminated child processes */
 
 struct rusage {
-  	struct timeval ru_utime;	/* user time used */
+	struct timeval ru_utime;	/* user time used */
 	struct timeval ru_stime;	/* system time used */
 	long ru_maxrss;
 	long ru_ixrss;               /* XXX: 0 */
diff --git a/winsup/cygwin/include/sys/socket.h b/winsup/cygwin/include/sys/socket.h
index 13217a068..89b9af7f3 100644
--- a/winsup/cygwin/include/sys/socket.h
+++ b/winsup/cygwin/include/sys/socket.h
@@ -18,7 +18,7 @@ extern "C"
   int getsockname (int, struct sockaddr *__addr, int *);
   int listen (int, int __n);
   int recv (int, void *__buff, int __len, unsigned int __flags);
-  int recvfrom (int, char *__buff, int __len, int __flags, 
+  int recvfrom (int, char *__buff, int __len, int __flags,
 			 struct sockaddr *__from, int *__fromlen);
   int send (int, const void *__buff, int __len, unsigned int __flags);
   int sendto (int, const void *, int, unsigned int, const struct sockaddr *, int);
diff --git a/winsup/cygwin/include/sys/syslog.h b/winsup/cygwin/include/sys/syslog.h
index 65c6688f2..3186804a5 100644
--- a/winsup/cygwin/include/sys/syslog.h
+++ b/winsup/cygwin/include/sys/syslog.h
@@ -2,31 +2,31 @@
 #define	_SYS_LOG_H
 
 #include <sys/cdefs.h>
-#define	LOG_EMERG	0	
-#define	LOG_ALERT	1	
-#define	LOG_CRIT	2	
-#define	LOG_ERR		3	
-#define	LOG_WARNING	4	
-#define	LOG_NOTICE	5	
-#define	LOG_INFO	6	
-#define	LOG_DEBUG	7	
+#define	LOG_EMERG	0
+#define	LOG_ALERT	1
+#define	LOG_CRIT	2
+#define	LOG_ERR		3
+#define	LOG_WARNING	4
+#define	LOG_NOTICE	5
+#define	LOG_INFO	6
+#define	LOG_DEBUG	7
+
+#define	LOG_PRIMASK	0x07
 
-#define	LOG_PRIMASK	0x07	
-				
 #define	LOG_PRI(p)	((p) & LOG_PRIMASK)
 #define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
 
-#define	LOG_KERN	(0<<3)	
-#define	LOG_USER	(1<<3)	
-#define	LOG_MAIL	(2<<3)	
-#define	LOG_DAEMON	(3<<3)	
-#define	LOG_AUTH	(4<<3)	
-#define	LOG_SYSLOG	(5<<3)	
-#define	LOG_LPR		(6<<3)	
-#define	LOG_NEWS	(7<<3)	
-#define	LOG_UUCP	(8<<3)	
-#define	LOG_CRON	(9<<3)	
-#define	LOG_AUTHPRIV	(10<<3)	
+#define	LOG_KERN	(0<<3)
+#define	LOG_USER	(1<<3)
+#define	LOG_MAIL	(2<<3)
+#define	LOG_DAEMON	(3<<3)
+#define	LOG_AUTH	(4<<3)
+#define	LOG_SYSLOG	(5<<3)
+#define	LOG_LPR		(6<<3)
+#define	LOG_NEWS	(7<<3)
+#define	LOG_UUCP	(8<<3)
+#define	LOG_CRON	(9<<3)
+#define	LOG_AUTHPRIV	(10<<3)
 #define LOG_FTP		(11<<3)
 
 /* Codes through 15 are reserved for system use */
@@ -40,11 +40,11 @@
 #define LOG_LOCAL7	(23<<3)
 
 #define	LOG_NFACILITIES	24
-#define	LOG_FACMASK	0x03f8	
+#define	LOG_FACMASK	0x03f8
 #define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
 
-#define	LOG_MASK(pri)	(1 << (pri))		
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	
+#define	LOG_MASK(pri)	(1 << (pri))
+#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)
 
 /*
  * Option flags for openlog.
diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h
index b0a242a33..b0dc2e4f3 100644
--- a/winsup/cygwin/include/sys/termios.h
+++ b/winsup/cygwin/include/sys/termios.h
@@ -8,10 +8,10 @@
 #define TCIOFF		2
 #define TCION		3
 
-#define TCGETA   	5
-#define TCSETA   	6
-#define TCSETAW	 	7
-#define TCSETAF	 	8
+#define TCGETA	5
+#define TCSETA	6
+#define TCSETAW		7
+#define TCSETAF		8
 
 #define TCIFLUSH	0
 #define TCOFLUSH	1
@@ -167,23 +167,23 @@
 
 #define VDISCARD	1
 #define VEOL		2
-#define VEOL2   	3
+#define VEOL2		3
 #define VEOF		4
 #define VERASE		5
 #define VINTR		6
 #define VKILL		7
-#define VLNEXT 		8
+#define VLNEXT		8
 #define VMIN		9
 #define VQUIT		10
-#define VREPRINT 	11
+#define VREPRINT	11
 #define VSTART		12
 #define VSTOP		13
 #define VSUSP		14
-#define VSWTC 		15
+#define VSWTC		15
 #define VTIME		16
-#define VWERASE 	17
+#define VWERASE	17
 
-#define NCCS 		18
+#define NCCS		18
 
 typedef unsigned char cc_t;
 typedef unsigned int  tcflag_t;