changeset 1304:579d37cb4395

[xemacs-hg @ 2003-02-15 11:20:38 by ben] make-src-depend updated in previous checkin but omitted in patcher; this time just correct the usage note and check in the changelog
author ben
date Sat, 15 Feb 2003 11:20:40 +0000
parents f99d3d25df86
children aa823204ffdb
files src/ChangeLog src/event-msw.c src/make-src-depend src/syswindows.h
diffstat 4 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Feb 15 10:16:14 2003 +0000
+++ b/src/ChangeLog	Sat Feb 15 11:20:40 2003 +0000
@@ -17,6 +17,13 @@
 	Nothing but niggly spacing changes -- one space before a paren
 	starting a function-call arglist, please.
 
+	* make-src-depend:
+	When QUICK_BUILD, don't put lisp.h, config.h, and related as
+	dependencies of all source files, so that changes to these files
+	don't trigger total rebuilding of the src directory.
+	Update info on what's a GTK-only and X-only file and use HAVE_XLIKE
+	for files shared between GTK and X.
+
 2003-02-14  Ben Wing  <ben@xemacs.org>
 
 	* buffer.c:
--- a/src/event-msw.c	Sat Feb 15 10:16:14 2003 +0000
+++ b/src/event-msw.c	Sat Feb 15 11:20:40 2003 +0000
@@ -3783,7 +3783,9 @@
    But "cch" means "count of characters", not bytes.  I'll assume the doc
    writers messed up and the programmer was correct.  Also, this approach
    is safe even if it's actually the other way around. */
-#ifdef CYGWIN_HEADERS /* Another Cygwin prototype error */
+#if defined (CYGWIN_HEADERS) && !defined (W32API_2_2)
+				/* Another Cygwin prototype error,
+				   fixed in v2.2 of w32api */
 				XECOMCALL4 (psl, GetPath, (LPSTR) resolved,
 					    PATH_MAX, &wfd, 0)
 #else
--- a/src/make-src-depend	Sat Feb 15 10:16:14 2003 +0000
+++ b/src/make-src-depend	Sat Feb 15 11:20:40 2003 +0000
@@ -35,9 +35,6 @@
 
 Generates Makefile dependencies for the XEmacs src directory.
 The dependencies are written to stdout.
-
-If --quick-build, don't include config.h and lisp.h in the dependencies,
-for faster rebuilding.
 ";
 
 die $usage if @ARGV;
--- a/src/syswindows.h	Sat Feb 15 10:16:14 2003 +0000
+++ b/src/syswindows.h	Sat Feb 15 11:20:40 2003 +0000
@@ -151,6 +151,12 @@
 
 #ifdef CYGWIN_HEADERS
 
+#include <w32api.h> /* for version info */
+
+#if __W32API_MAJOR_VERSION > 2 || (__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION >= 2)
+#define W32API_2_2
+#endif
+
 /* Various brokennesses in various versions of Cygwin */
 
 /* windows.h defines. */
@@ -356,6 +362,8 @@
   WCHAR szDisplay[64];
 } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW;
 
+#ifndef W32API_2_2
+
 typedef struct tagNMTTDISPIFNOA
 {
   NMHDR hdr;
@@ -380,6 +388,8 @@
 #endif
 } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW;
 
+#endif /* not W32API_2_2 */
+
 #endif /* (_WIN32_IE >= 0x0400) */
 
 /* shlobj.h defines */