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.

1 files changed, 3 insertions, 3 deletions

diff --git a/nt/configure.bat b/nt/configure.bat
index e91165de473..56793a0d1c3 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -23,7 +23,7 @@ rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem

 rem   + MS Windows 95, NT or later

 rem   + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75

-rem     or later) and the Mingw32 and W32 API headers and libraries.

+rem     or later) and the Mingw32 and Windows API headers and libraries.

 rem   + Visual Studio 2005 is not supported at this time.

 rem

 rem For reference, here is a list of which builds of GNU make are known to

@@ -426,7 +426,7 @@ rem   problem).  The gcc/mingw32 2.95.2 headers are okay, as are distros
 rem   of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.

 rem   Beginning with Emacs 23, we need usp10.h.

 rem

-echo Checking whether W32 API headers are too old...

+echo Checking whether Windows API headers are too old...

 echo #include "windows.h" >junk.c

 echo #include "usp10.h" >>junk.c

 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c

@@ -469,7 +469,7 @@ goto end
 echo.

 echo Configure failed.

 echo To configure Emacs for Windows, you need to have either

-echo gcc-2.95 or later with Mingw32 and the W32 API headers,

+echo gcc-2.95 or later with Mingw32 and the Windows API headers,

 echo or MSVC 2.x or later.

 del junk.c

 goto end