Index: cups/thread-private.h
===================================================================
--- cups/thread-private.h	(revision 10431)
+++ cups/thread-private.h	(working copy)
@@ -49,7 +49,7 @@
 typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
 typedef struct _cups_mutex_s
 {
-  int			m_init;		/* Flag for on-demand initialization */		
+  int			m_init;		/* Flag for on-demand initialization */
   CRITICAL_SECTION	m_criticalSection;
 					/* Win32 Critical Section */
 } _cups_mutex_t;
@@ -62,6 +62,7 @@
 #    define _cupsThreadSetData(k,p) TlsSetValue(k,p)
 
 #  else
+typedef void	*(*_cups_thread_func_t)(void *arg);
 typedef char	_cups_mutex_t;
 typedef char	_cups_rwlock_t;
 typedef void	*_cups_threadkey_t;
Index: test/ipp-1.1.test
===================================================================
--- test/ipp-1.1.test	(revision 10431)
+++ test/ipp-1.1.test	(working copy)
@@ -15,7 +15,10 @@
 # Usage:
 #
 #   ./ipptool -f filename [-d document-uri=SOMEURI] -t printer-uri ipp-1.1.test
+#   ./ipptool -f filename -d NOPRINT=1 -t printer-uri ipp-1.1.test
 #
+# The latter form disables all but the basic file printing.
+#
 
 # Regular expressions for URI schemes:
 #
@@ -1275,6 +1278,7 @@
 
 # Test PDF output
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 
@@ -1310,6 +1314,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DUPLEX
@@ -1347,6 +1352,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 
@@ -1382,6 +1388,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DUPLEX
@@ -1421,6 +1428,7 @@
 
 # Test PostScript output
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 
@@ -1456,6 +1464,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DUPLEX
@@ -1493,6 +1502,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 
@@ -1528,6 +1538,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DUPLEX
@@ -1567,6 +1578,7 @@
 
 # Test JPEG output
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 
@@ -1602,6 +1614,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 
@@ -1637,6 +1650,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_4X6_MEDIA
 
@@ -1672,6 +1686,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 
@@ -1707,6 +1722,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 
@@ -1742,6 +1758,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_4X6_MEDIA
 
@@ -1779,6 +1796,7 @@
 
 # Print-Job with job-sheets
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_STANDARD_SHEET
@@ -1816,6 +1834,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_STANDARD_SHEET
@@ -1853,6 +1872,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_STANDARD_SHEET
@@ -1890,6 +1910,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_STANDARD_SHEET
@@ -1929,6 +1950,7 @@
 
 # Test number-up output
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_2UP
@@ -1966,6 +1988,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_2UP
@@ -2003,6 +2026,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_2UP
@@ -2040,6 +2064,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_POSTSCRIPT
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_2UP
@@ -2079,6 +2104,7 @@
 
 # Test output with print-quality...
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_4X6_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DRAFT_QUALITY
@@ -2116,6 +2142,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_4X6_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_NORMAL_QUALITY
@@ -2153,6 +2180,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_JPEG
 	SKIP-IF-NOT-DEFINED OPTIONAL_4X6_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_HIGH_QUALITY
@@ -2190,6 +2218,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_A4_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DRAFT_QUALITY
@@ -2227,6 +2256,7 @@
 }
 
 {
+	SKIP-IF-DEFINED NOPRINT
 	SKIP-IF-NOT-DEFINED OPTIONAL_PDF
 	SKIP-IF-NOT-DEFINED OPTIONAL_LETTER_MEDIA
 	SKIP-IF-NOT-DEFINED OPTIONAL_DRAFT_QUALITY