From 42a7e7f1c4ac52d283d3bdbf3a119bef8b2124aa Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 15 Nov 2010 09:21:18 -0800
Subject: [PATCH] Remove config.h include guards.

* src/w32proc.c:
* src/w32inevt.c:
* src/w32heap.c:
* src/w32.c: Remove config.h include guards.
---
 src/ChangeLog  | 5 +++++
 src/w32.c      | 4 ----
 src/w32heap.c  | 5 -----
 src/w32inevt.c | 5 -----
 src/w32proc.c  | 7 +------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 49c179aeb46..af5bbf9e8fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* w32proc.c:
+	* w32inevt.c:
+	* w32heap.c:
+	* w32.c: Remove config.h include guards.
+
 	* callproc.c (child_setup): Reorder code to simplify #ifdefs.
 	No code changes.
 
diff --git a/src/w32.c b/src/w32.c
index ae34ac6aadb..4ae316765b8 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -38,9 +38,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* must include CRT headers *before* config.h */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #undef access
 #undef chdir
@@ -6086,5 +6084,3 @@ serial_configure (struct Lisp_Process *p, Lisp_Object contact)
 
 /* end of w32.c */
 
-/* arch-tag: 90442dd3-37be-482b-b272-ac752e3049f1
-   (do not change this comment) */
diff --git a/src/w32heap.c b/src/w32heap.c
index 285325e3f8b..39ff1017466 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -21,10 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
 #include <setjmp.h>
 
@@ -301,5 +298,3 @@ _heap_term (void)
 
 #endif
 
-/* arch-tag: 9a6a9860-040d-422d-8905-450dd535cd9c
-   (do not change this comment) */
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 3757c528e8b..65b57ffa1f7 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -23,10 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
 #include <windows.h>
 #include <setjmp.h>
@@ -784,5 +781,3 @@ w32_console_read_socket (struct terminal *terminal,
   return ret;
 }
 
-/* arch-tag: 0bcb39b7-d085-4b85-9070-6750e8c03047
-   (do not change this comment) */
diff --git a/src/w32proc.c b/src/w32proc.c
index 49687574472..ff6e22d2547 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -32,10 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
-
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #undef signal
 #undef wait
@@ -2370,7 +2367,5 @@ where the performance impact may be noticeable even on modern hardware.  */);
   staticpro (&Vw32_valid_locale_ids);
   staticpro (&Vw32_valid_codepages);
 }
-/* end of ntproc.c */
+/* end of w32proc.c */
 
-/* arch-tag: 23d3a34c-06d2-48a1-833b-ac7609aa5250
-   (do not change this comment) */
-- 
2.39.5