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 00b3b331612141fa2ccc9dded66fd5cb8e26e911..6689211ab0288af79d4d867ba9a88271edaeafeb 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 f0a0a9c5ad9b9e4479ee3e96c88f4369f15ccb36..1ff9cff793fe7cd8fdd2a7dacc8b70462ebc4880 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 c872730397d87aa81f7d01f560a78ef37779ebd0..0a75e5c4ad789c13e3bae6c16937bb35dcff98b3 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;