diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
| commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
| tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /admin | |
| parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
| parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
| download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz | |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 3 | ||||
| -rw-r--r-- | admin/ChangeLog | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index a98d1b9039e..18423c23420 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -19,8 +19,9 @@ __MSDOS__ Ditto. __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c. DOS_NT Compiling for either the MS-DOS or native MS-Windows port. WINDOWSNT Compiling the native MS-Windows (W32) port. -__MINGW32__ Compiling the W32 port with the MinGW port of GCC. +__MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC. _MSC_VER Compiling the W32 port with the Microsoft C compiler. +MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC. DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). SOLARIS2 USG diff --git a/admin/ChangeLog b/admin/ChangeLog index cc69367555f..6d134046a38 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Oscar Fuentes <ofv@wanadoo.es> + + * admin/CPP-DEFINES: Mention MINGW_W64. + 2014-11-22 Glenn Morris <rgm@gnu.org> * admin.el (set-version): No more need to update nt/*.rc. |