diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/w32proc.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 7 |
1 files changed, 1 insertions, 6 deletions
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) */ | ||