--- a/notes.txt	Wed Dec 09 15:50:11 2015 +0000
+++ b/notes.txt	Thu Dec 10 17:55:59 2015 +0000
@@ -340,12 +340,21 @@
 More small fixes, in process-nt.c very speculative, get me to through
 compilation to (lots of) linking errors
 Clean and rebuild and only Xpm lib linking errors, turn off Xpm and
-build completes except for makeinfo (shell script pblm), but
-xemacs.exe works (on screen, not -nw).
+build completes except for makeinfo (shell script pblm)
 
 Using VS for the winlibs, to set flags etc. use the wrench icon in the
 Property Manager window.
 Copied all but WIN32 preprocessor flag from the 32-bit VS-built
-solution
+solution.
 Needed to fuss with linker debugging flags and input (module
-definition file) to get it all to work, but now it does!
+definition file) to get it all to work for Xpm, but now it does!
+Installs under Program Files, but not finding packages despite
+load-path being
+  ("c:\\C64\\home\\ht\\lib\\emacs\\" "c:/C64/usr/local/share/xemacs/xemacs-packages/lisp" "c:\\Program Files\\XEmacs\\XEmacs-21.5-b34\\lisp\\")
+
+Backed out change to winsock.h, and updated corresponding comments in
+systime.h
+
+Now getting 2192 conversion warnings, makes me v. nervous!
+
+But it runs. . .

--- a/nt/config.inc.samp	Wed Dec 09 15:50:11 2015 +0000
+++ b/nt/config.inc.samp	Thu Dec 10 17:55:59 2015 +0000
@@ -175,7 +175,13 @@
 # Cygwin sitting around already.  If not, you should.  Cygwin provides a
 # `makeinfo.exe' in /usr/bin/makeinfo (/usr/bin is virtual, it's /bin in
 # the actual file system).
-MAKEINFO=c:\cygwin\bin\makeinfo.exe
+# MAKEINFO=c:\[cygwin]\bin\makeinfo
+
+# Set this to specify the location of a Windows-compatible hg.
+# The default will not include any hg version info in the emacs-version string
+# You can use $(MAKEDIR)\hg.bat if you have cygwin versions of python2.7 and hg,
+# for other versions edit hg.bat
+HG=hg
 
 # Set this to enable debug code in XEmacs that doesn't slow things down,
 # and to add debugging information to the executable. (The code that's

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nt/hg.bat	Thu Dec 10 17:55:59 2015 +0000
@@ -0,0 +1,1 @@
+@c:\C64\bin\python2.7 /usr/bin/hg %1 %2

--- a/nt/xemacs.mak	Wed Dec 09 15:50:11 2015 +0000
+++ b/nt/xemacs.mak	Thu Dec 10 17:55:59 2015 +0000
@@ -75,7 +75,7 @@
 !if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh]
 !endif
 !if exist($(SRCROOT)\.hg)
-!if [hg identify >> $(SRCROOT)\version.sh]
+!if [$(HG) id -i  >> $(SRCROOT)\version.sh]
 !endif
 !endif
 

--- a/src/systime.h	Wed Dec 09 15:50:11 2015 +0000
+++ b/src/systime.h	Thu Dec 10 17:55:59 2015 +0000
@@ -47,19 +47,8 @@
 
 #ifdef WIN32_NATIVE
 
-/* This defines struct timeval */
-/* Temporary override -- HST
-#define _TIMEVAL_DEFINED
-
-struct timeval
-{
-        time_t tv_sec;
-        time_t tv_usec;
-};
-#ifndef _INC_WINDOWS
-#include <windows.h>
-#endif / * _INC_WINDOWS * /
-typedef UINT_PTR        SOCKET; */
+/* This defines struct timeval [! incorrectly (32-bit values),
+    but we seem to get away with it -- HST] */
 #include <winsock.h>
 
 struct timezone