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

gitster · gitster · commit 5f35dfef25e0 · 2013-01-10T13:47:43.000-08:00
* jc/comment-cygwin-win32api-in-makefile:
  Makefile: add comment on CYGWIN_V15_WIN32API
diff --git a/Makefile b/Makefile
@@ -281,6 +281,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
`@@ -281,6 +281,10 @@ all::`
`281`	`281`	`#`
`282`	`282`	`# Define NO_REGEX if you have no or inferior regex support in your C library.`
`283`	`283`	`#`
	`284`	`+# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not`
	`285`	`+# using the current w32api packages. The recommended approach, however,`
	`286`	`+# is to update your installation if compilation errors occur.`
	`287`	`+#`
`284`	`288`	`# Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the`
`285`	`289`	`# user.`
`286`	`290`	`#`