Whitespace cleanup.

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

2 files changed, 12 insertions, 12 deletions

diff --git a/winsup/cygwin/regexp/regexp.c b/winsup/cygwin/regexp/regexp.c
index 26f4b8d..7bcd954 100644
--- a/winsup/cygwin/regexp/regexp.c
+++ b/winsup/cygwin/regexp/regexp.c
@@ -340,7 +340,7 @@ int *flagp;
 	}
 
 	/* Make a closing node, and hook it on the end. */
-	ender = regnode((paren) ? CLOSE+parno : END);	
+	ender = regnode((paren) ? CLOSE+parno : END);
 	regtail(ret, ender);
 
 	/* Hook the tails of the branches to the closing node. */
@@ -572,7 +572,7 @@ int *flagp;
 		 * On entry, the char at regparse[-1] is going to go
 		 * into the string, no matter what it is.  (It could be
 		 * following a \ if we are entered from the '\' case.)
-		 * 
+		 *
 		 * Basic idea is to pick up a good char in  ch  and
 		 * examine the next char.  If it's *+? then we twiddle.
 		 * If it's \ then we frozzle.  If it's other magic char
@@ -610,7 +610,7 @@ int *flagp;
 					goto done;	/* and we are done */
 
 				case '?': case '+': case '*':
-					if (!regprev) 	/* If just ch in str, */
+					if (!regprev)	/* If just ch in str, */
 						goto magic;	/* use it */
 					/* End mult-char string one early */
 					regparse = regprev; /* Back up parse */
@@ -627,7 +627,7 @@ int *flagp;
 					default:
 						/* Backup point is \, scan							 * point is after it. */
 						regprev = regparse;
-						regparse++; 
+						regparse++;
 						continue;	/* NOT break; */
 					}
 				}
@@ -949,12 +949,12 @@ char *prog;
 			}
 			break;
 		case ANYOF:
- 			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL)
+			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL)
 				return(0);
 			reginput++;
 			break;
 		case ANYBUT:
- 			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL)
+			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL)
 				return(0);
 			reginput++;
 			break;
@@ -1175,7 +1175,7 @@ regexp *r;
 		next = regnext(s);
 		if (next == NULL)		/* Next ptr. */
 			printf("(0)");
-		else 
+		else
 			printf("(%d)", (s-r->program)+(next-s));
 		s += 3;
 		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
diff --git a/winsup/cygwin/regexp/regsub.c b/winsup/cygwin/regexp/regsub.c
index 3983cc5..e544072 100644
--- a/winsup/cygwin/regexp/regsub.c
+++ b/winsup/cygwin/regexp/regsub.c
@@ -69,11 +69,11 @@ char *dest;
 			no = *src++ - '0';
 		else
 			no = -1;
- 		if (no < 0) {	/* Ordinary character. */
- 			if (c == '\\' && (*src == '\\' || *src == '&'))
- 				c = *src++;
- 			*dst++ = c;
- 		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
+		if (no < 0) {	/* Ordinary character. */
+			if (c == '\\' && (*src == '\\' || *src == '&'))
+				c = *src++;
+			*dst++ = c;
+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
 			len = prog->endp[no] - prog->startp[no];
 			(void) strncpy(dst, prog->startp[no], len);
 			dst += len;