Several libcups files did not have the Apple license exception notice (STR #4361)

VEOL2 isn't available on older System V versions, apparently...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11628 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 3635e8b126d1b4a3df08fc55cb7d6a2131cb0fde..de0c4ba8757e279ef0534571c65a784571bdb00a 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -7,6 +7,8 @@ CHANGES IN CUPS V1.7.2
          (STR #4356)
        - Several libcups files did not have the Apple license exception
          notice (STR #4361)
+       - Several libcups files did not have the Apple license exception
+         notice (STR #4361)
        - Fixed a D-BUS threading issue that caused the scheduler to crash
          (STR #4347)
        - The scheduler now automatically reconnects to Avahi as needed

diff --git a/cups/usersys.c b/cups/usersys.c
index 5dbf1e99aab2b89a518b98b27bf5e4a71ced4204..4a644b96faea7df1cf3489c988f5a9c12055d051 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -703,7 +703,10 @@ _cupsGetPassword(const char *prompt)       /* I - Prompt string */
 
   while ((passbytes = read(tty, &passch, 1)) == 1)
   {
-    if (passch == noecho.c_cc[VEOL] || passch == noecho.c_cc[VEOL2] ||
+    if (passch == noecho.c_cc[VEOL] ||
+#  ifdef VEOL2
+        passch == noecho.c_cc[VEOL2] ||
+#  endif /* VEOL2 */
         passch == 0x0A || passch == 0x0D)
     {
      /*