From b52fa95643d6c769fb85d4f6588b351ac8587ce4 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Fri, 24 Feb 2006 12:29:21 +0000
Subject: [PATCH] Revert incorrect patch sequence

---
 goldlib/gall/gdefs.h    | 7 +++++++
 goldlib/gall/gfilutil.h | 9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index 4778df3..1a482f4 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -101,6 +101,13 @@
 #define NL "\n"
 #endif
 
+/*  ----------------------------------------------------------------*/
+
+#if defined(_MSC_VER)
+#define popen(f,m) _popen(f,m)
+#define pclose(fh) _pclose(fh)
+#endif
+
 /*  ------------------------------------------------------------------
 //  Spellchecker using dynamic library load */
 #if !defined(GCFG_NOSPELLDLL) && !defined(__WIN32__)
diff --git a/goldlib/gall/gfilutil.h b/goldlib/gall/gfilutil.h
index 396acb4..ca9cc98 100644
--- a/goldlib/gall/gfilutil.h
+++ b/goldlib/gall/gfilutil.h
@@ -83,15 +83,6 @@
 #define R_OK 0
 #endif
 
-
-//  ------------------------------------------------------------------
-
-#if defined(_MSC_VER)
-#define popen(f,m) _popen(f,m)
-#define pclose(fh) _pclose(fh)
-#endif
-
-
 //  ------------------------------------------------------------------
 
 #define GMAXPATH (FILENAME_MAX+1) /* ANSI C */