diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 01:18:29 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 01:18:29 -0700 |
commit | b46a6a83b3c30d34aa6b80633394c74e6145291c (patch) | |
tree | 70cf89c43b7663acf77c2e54f2ed644d1eb18a4e /nt/INSTALL | |
parent | 72b255c7e7856eb0abefb1149211a8be519f6fef (diff) | |
download | emacs-b46a6a83b3c30d34aa6b80633394c74e6145291c.tar.gz |
Don't use the abbreviation "win" to refer to Windows (Bug#10421).
* lisp/org/ob-lilypond.el (ly-w32-ly-path): Rename from ly-win32-ly-path.
(ly-w32-pdf-path): Rename from ly-win32-pdf-path.
(ly-w32-midi-path): Rename from ly-win32-midi-path.
(ly-determine-ly-path, ly-determine-pdf-path, ly-determine-midi-path):
Check for "windows-nt", not "win32", in system-type.
* src/regex.c (MAX_BUF_SIZE): Remove some incorrect and
long-ago-commented-out code that talks about "WIN32".
* src/w32heap.h (OS_WINDOWS_95): Rename from OS_WIN95.
All uses changed.
Diffstat (limited to 'nt/INSTALL')
-rw-r--r-- | nt/INSTALL | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nt/INSTALL b/nt/INSTALL index 96ef52faf5e..2293610adf3 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -121,7 +121,7 @@ To compile Emacs, you will need either Microsoft Visual C++ 2.0, or later and nmake, or a Windows port of GCC 2.95 or later with MinGW - and W32 API support and a port of GNU Make. You can use the Cygwin + and Windows API support and a port of GNU Make. You can use the Cygwin ports of GCC, but Emacs requires the MinGW headers and libraries to build (latest versions of the Cygwin toolkit, at least since v1.3.3, include the MinGW headers and libraries as an integral part). @@ -591,7 +591,7 @@ * Trouble-shooting The main problems that are likely to be encountered when building - Emacs stem from using an old version of GCC, or old MinGW or W32 API + Emacs stem from using an old version of GCC, or old MinGW or Windows API headers. Additionally, Cygwin ports of GNU make may require the Emacs source tree to be mounted with text!=binary, because the makefiles generated by configure.bat necessarily use DOS line endings. Also, @@ -603,7 +603,7 @@ 2.95 or later is needed, because that is when the Windows port gained sufficient support for anonymous structs and unions to cope with some definitions from winnt.h that are used by addsection.c. - Older versions of the W32 API headers that come with Cygwin and MinGW + Older versions of the Windows API headers that come with Cygwin and MinGW may be missing some definitions required by Emacs, or broken in other ways. In particular, uniscribe APIs were added to MinGW CVS only on 2006-03-26, so releases from before then cannot be used. |