diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/w32proc.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index 0c178e7a2f6..26cfa2996d0 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -72,8 +72,6 @@ extern BOOL WINAPI IsValidLocale (LCID, DWORD); | |||
| 72 | + ((DWORD_PTR)(var) - (section)->VirtualAddress) \ | 72 | + ((DWORD_PTR)(var) - (section)->VirtualAddress) \ |
| 73 | + (filedata).file_base)) | 73 | + (filedata).file_base)) |
| 74 | 74 | ||
| 75 | Lisp_Object Qhigh, Qlow; | ||
| 76 | |||
| 77 | /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ | 75 | /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ |
| 78 | static signal_handler sig_handlers[NSIG]; | 76 | static signal_handler sig_handlers[NSIG]; |
| 79 | 77 | ||