Change all uses of win95, winnt, and win32 into Windows 95, Windows

NT, and W32, respectively.
Expand "win" substring in variables referring to Microsoft Windows
constructs into "windows".
Canonicalize header comments to use same terminology.

diff --git a/src/w32gui.h b/src/w32gui.h
index 00b3b33..6689211 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,4 +1,4 @@
-/* Definitions and headers for communication with Win32 GUI.
+/* Definitions and headers for communication on the Microsoft W32 API.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.

diff --git a/src/w32inevt.h b/src/w32inevt.h
index f0a0a9c..1ff9cff 100644 (file)
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,4 +1,4 @@
-/* Input routines for Emacs on Win32 API.
+/* Input routines for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.

diff --git a/src/w32term.h b/src/w32term.h
index c872730..0a75e5c 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,4 +1,4 @@
-/* Definitions and headers for communication under the Win32 API.
+/* Definitions and headers for communication on the Microsoft W32 API.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -603,8 +603,8 @@ typedef struct {
 #define WND_LAST_INDEX      (16)
 #define WND_EXTRA_BYTES     (WND_LAST_INDEX)
 
-extern DWORD dwWinThreadId;
-extern HANDLE hWinThread;
+extern DWORD dwWindowsThreadId;
+extern HANDLE hWindowsThread;
 extern DWORD dwMainThreadId;
 extern HANDLE hMainThread;