From 31c513d4b75d6202feaba4b185f01efcff7e4c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Mar 2013 14:26:50 +0100
Subject: [PATCH] gawk: Remove now-unneeded Cygwin patch.

---
 pkgs/tools/text/gawk/cygwin-identifiers.patch | 75 -------------------
 pkgs/tools/text/gawk/default.nix              |  2 +-
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 pkgs/tools/text/gawk/cygwin-identifiers.patch

diff --git a/pkgs/tools/text/gawk/cygwin-identifiers.patch b/pkgs/tools/text/gawk/cygwin-identifiers.patch
deleted file mode 100644
index baff9b55481d..000000000000
--- a/pkgs/tools/text/gawk/cygwin-identifiers.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-This patch fixes compilation on Windows, where some of the identifiers
-would clash.
-
-commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0
-Author: Arnold D. Robbins <arnold@skeeve.com>
-Date:   Fri Jul 29 13:25:57 2011 +0300
-
-    Fix DJGPP problem with libsigsegv.
-
-diff --git a/builtin.c b/builtin.c
-index 4d87592..941f5ad 100644
---- a/builtin.c
-+++ b/builtin.c
-@@ -605,7 +605,7 @@ format_tree(
- 	NODE *arg;
- 	long fw, prec, argnum;
- 	int used_dollar;
--	int lj, alt, big, bigbig, small, have_prec, need_format;
-+	int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format;
- 	long *cur = NULL;
- 	uintmax_t uval;
- 	int sgn;
-@@ -725,7 +725,7 @@ format_tree(
- 		signchar = FALSE;
- 		zero_flag = FALSE;
- 		quote_flag = FALSE;
--		lj = alt = big = bigbig = small = FALSE;
-+		lj = alt = big_flag = bigbig_flag = small_flag = FALSE;
- 		fill = sp;
- 		cp = cend;
- 		chbuf = lchbuf;
-@@ -907,7 +907,7 @@ check_pos:
- 			goto retry;  
- #endif
- 		case 'l':
--			if (big)
-+			if (big_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -921,10 +921,10 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			big = TRUE;
-+			big_flag = TRUE;
- 			goto retry;
- 		case 'L':
--			if (bigbig)
-+			if (bigbig_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -938,10 +938,10 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			bigbig = TRUE;
-+			bigbig_flag = TRUE;
- 			goto retry;
- 		case 'h':
--			if (small)
-+			if (small_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -955,7 +955,7 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			small = TRUE;
-+			small_flag = TRUE;
- 			goto retry;
- 		case 'c':
- 			need_format = FALSE;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 29b3936a0ba9..eba1dc2ac7fd 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "04vd0axif762mf781pj3days6ilv2333b9zi9c50y5mma66g5q91";
   };
 
-  patches = stdenv.lib.optional stdenv.isCygwin [ ./cygwin-identifiers.patch ];
+  patches = [];
 
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1