diff options
author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
---|---|---|
committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
commit | 39372e1a1032521be74575bb06f95a3898fbae30 (patch) | |
tree | 754bd242a23d2358ea116126fcb0a629947bd9ec /nt/preprep.c | |
parent | 6a3121904d76e3b2f63007341d48c5c1af55de80 (diff) | |
parent | e11aaee266da52937a3a031cb108fe13f68958c3 (diff) | |
download | emacs-39372e1a1032521be74575bb06f95a3898fbae30.tar.gz |
merge from trunk
Diffstat (limited to 'nt/preprep.c')
-rw-r--r-- | nt/preprep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nt/preprep.c b/nt/preprep.c index 42855ce7f20..49532d0dd27 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,5 +1,5 @@ /* Pre-process emacs.exe for profiling by MSVC. - Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. #include <stdio.h> #include <fcntl.h> #include <time.h> -#if defined(__GNUC__) && !defined(_W64) +#if defined(__GNUC__) && !defined(MINGW_W64) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif |