aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-11-15 09:21:18 -0800
committerDan Nicolaescu2010-11-15 09:21:18 -0800
commit42a7e7f1c4ac52d283d3bdbf3a119bef8b2124aa (patch)
tree1d49014c24458ef37c66eb75ced497cb3c45bdb6 /src
parent678029433d360cf1e5a95de28168b69ed1c6f9a7 (diff)
downloademacs-42a7e7f1c4ac52d283d3bdbf3a119bef8b2124aa.tar.gz
emacs-42a7e7f1c4ac52d283d3bdbf3a119bef8b2124aa.zip
Remove config.h include guards.
* src/w32proc.c: * src/w32inevt.c: * src/w32heap.c: * src/w32.c: Remove config.h include guards.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c4
-rw-r--r--src/w32heap.c5
-rw-r--r--src/w32inevt.c5
-rw-r--r--src/w32proc.c7
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 @@
12010-11-15 Dan Nicolaescu <dann@ics.uci.edu> 12010-11-15 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * w32proc.c:
4 * w32inevt.c:
5 * w32heap.c:
6 * w32.c: Remove config.h include guards.
7
3 * callproc.c (child_setup): Reorder code to simplify #ifdefs. 8 * callproc.c (child_setup): Reorder code to simplify #ifdefs.
4 No code changes. 9 No code changes.
5 10
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/>. */
38 38
39/* must include CRT headers *before* config.h */ 39/* must include CRT headers *before* config.h */
40 40
41#ifdef HAVE_CONFIG_H
42#include <config.h> 41#include <config.h>
43#endif
44 42
45#undef access 43#undef access
46#undef chdir 44#undef chdir
@@ -6086,5 +6084,3 @@ serial_configure (struct Lisp_Process *p, Lisp_Object contact)
6086 6084
6087/* end of w32.c */ 6085/* end of w32.c */
6088 6086
6089/* arch-tag: 90442dd3-37be-482b-b272-ac752e3049f1
6090 (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/>. */
21 Geoff Voelker (voelker@cs.washington.edu) 7-29-94 21 Geoff Voelker (voelker@cs.washington.edu) 7-29-94
22*/ 22*/
23 23
24#ifdef HAVE_CONFIG_H
25#include <config.h> 24#include <config.h>
26#endif
27
28#include <stdio.h> 25#include <stdio.h>
29#include <setjmp.h> 26#include <setjmp.h>
30 27
@@ -301,5 +298,3 @@ _heap_term (void)
301 298
302#endif 299#endif
303 300
304/* arch-tag: 9a6a9860-040d-422d-8905-450dd535cd9c
305 (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/>. */
23*/ 23*/
24 24
25 25
26#ifdef HAVE_CONFIG_H
27#include <config.h> 26#include <config.h>
28#endif
29
30#include <stdio.h> 27#include <stdio.h>
31#include <windows.h> 28#include <windows.h>
32#include <setjmp.h> 29#include <setjmp.h>
@@ -784,5 +781,3 @@ w32_console_read_socket (struct terminal *terminal,
784 return ret; 781 return ret;
785} 782}
786 783
787/* arch-tag: 0bcb39b7-d085-4b85-9070-6750e8c03047
788 (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/>. */
32#include <setjmp.h> 32#include <setjmp.h>
33 33
34/* must include CRT headers *before* config.h */ 34/* must include CRT headers *before* config.h */
35
36#ifdef HAVE_CONFIG_H
37#include <config.h> 35#include <config.h>
38#endif
39 36
40#undef signal 37#undef signal
41#undef wait 38#undef wait
@@ -2370,7 +2367,5 @@ where the performance impact may be noticeable even on modern hardware. */);
2370 staticpro (&Vw32_valid_locale_ids); 2367 staticpro (&Vw32_valid_locale_ids);
2371 staticpro (&Vw32_valid_codepages); 2368 staticpro (&Vw32_valid_codepages);
2372} 2369}
2373/* end of ntproc.c */ 2370/* end of w32proc.c */
2374 2371
2375/* arch-tag: 23d3a34c-06d2-48a1-833b-ac7609aa5250
2376 (do not change this comment) */