mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Don't use __STDC__ on MS-Windows unless necessary (Bug #9066).

Browse Source 
nt/inc/ms-w32.h (__STDC__): Fiddle with value only for MSVC.

 src/w32term.c <input_signal_count>: Declare 'volatile' unconditionally.
This commit is contained in:
Eli Zaretskii 2013-02-16 15:59:37 +02:00
parent f277993be3
commit cd91fb4b0a
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nt/ChangeLog
View File

@ -1,3 +1,8 @@
2013-02-16 Eli Zaretskii <eliz@gnu.org>
* inc/ms-w32.h (__STDC__): Fiddle with value only for MSVC.
(Bug#9066)
2013-02-13 Juanma Barranquero <lekktu@gmail.com> 2013-02-13 Juanma Barranquero <lekktu@gmail.com>
* config.nt: Sync with autogen/config.in. * config.nt: Sync with autogen/config.in.

10
nt/inc/ms-w32.h
View File

@ -265,8 +265,11 @@ struct timespec
extern struct tm *gmtime_r (time_t const * restrict, struct tm * restrict); extern struct tm *gmtime_r (time_t const * restrict, struct tm * restrict);
extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict); extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
#ifdef _MSC_VER
/* This is hacky, but is necessary to avoid warnings about macro /* This is hacky, but is necessary to avoid warnings about macro
redefinitions using the SDK compilers. */ redefinitions using the MSVC compilers, since, when __STDC__ is
undefined or zero, those compilers declare functions like fileno,
lseek, and chdir, for which we defined macros above. */
#ifndef __STDC__ #ifndef __STDC__
#define __STDC__ 1 #define __STDC__ 1
#define MUST_UNDEF__STDC__ #define MUST_UNDEF__STDC__
@ -278,6 +281,11 @@ extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
#undef __STDC__ #undef __STDC__
#undef MUST_UNDEF__STDC__ #undef MUST_UNDEF__STDC__
#endif #endif
#else /* !_MSC_VER */
#include <direct.h>
#include <io.h>
#include <stdio.h>
#endif /* !_MSC_VER */
/* Defines that we need that aren't in the standard signal.h. */ /* Defines that we need that aren't in the standard signal.h. */
#define SIGHUP 1 /* Hang up */ #define SIGHUP 1 /* Hang up */

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2013-02-16 Eli Zaretskii <eliz@gnu.org> 2013-02-16 Eli Zaretskii <eliz@gnu.org>
* w32term.c <input_signal_count>: Declare 'volatile'
unconditionally. (Bug#9066)
* w32.c (set_errno): Reset h_errno and don't set it to any other * w32.c (set_errno): Reset h_errno and don't set it to any other
value. Set errno instead. value. Set errno instead.
(check_errno): Reset h_errno. (check_errno): Reset h_errno.

4
src/w32term.c
View File

@ -191,11 +191,7 @@ static Time last_mouse_movement_time;
/* Incremented by w32_read_socket whenever it really tries to read /* Incremented by w32_read_socket whenever it really tries to read
events. */ events. */
#ifdef __STDC__
static int volatile input_signal_count; static int volatile input_signal_count;
#else
static int input_signal_count;
#endif
#ifdef CYGWIN #ifdef CYGWIN
int w32_message_fd = -1; int w32_message_fd = -1;