--- kdeprint/cups/ipprequest.cpp.orig 2007-09-18 12:34:56.000000000 -0400 +++ kdeprint/cups/ipprequest.cpp 2007-09-18 13:08:06.000000000 -0400 @@ -33,7 +33,7 @@ #include #endif -#ifdef HAVE_CUPS_NO_PWD_CACHE +#if defined(HAVE_CUPS_NO_PWD_CACHE) && CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3 #include static QCString cups_authstring = ""; #endif @@ -309,7 +309,7 @@ return false; } -#ifdef HAVE_CUPS_NO_PWD_CACHE +#ifdef HAVE_CUPS_NO_PWD_CACHE && CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3 \ strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE ); #endif @@ -319,7 +319,7 @@ } request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); -#ifdef HAVE_CUPS_NO_PWD_CACHE +#ifdef HAVE_CUPS_NO_PWD_CACHE && CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3 \ cups_authstring = HTTP->authstring; #endif httpClose(HTTP);