Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maint

gitster · gitster · commit f2f5449379ef · 2013-01-14T07:34:37.000-08:00
* jc/comment-cygwin-win32api-in-makefile:
  Makefile: add comment on CYGWIN_V15_WIN32API
diff --git a/Makefile b/Makefile
@@ -273,6 +273,10 @@ all::
 #
 # Define NO_REGEX if you have no or inferior regex support in your C library.
 #
+# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not
+# using the current w32api packages. The recommended approach, however,
+# is to update your installation if compilation errors occur.
+#
 # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the
 # user.
 #

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,10 @@ all::`
`273`	`273`	`#`
`274`	`274`	`# Define NO_REGEX if you have no or inferior regex support in your C library.`
`275`	`275`	`#`
	`276`	`+# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not`
	`277`	`+# using the current w32api packages. The recommended approach, however,`
	`278`	`+# is to update your installation if compilation errors occur.`
	`279`	`+#`
`276`	`280`	`# Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the`
`277`	`281`	`# user.`
`278`	`282`	`#`