Merge in JohnR's page count fixes.

Jeremy.
(This used to be commit 2e3133fbe5531b9bbc9bf46a04b27fa58e555f5a)

2 files changed, 2 insertions, 0 deletions

diff --git a/source3/include/printing.h b/source3/include/printing.h
index 0a733b580a..9a0775186b 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -36,6 +36,7 @@ struct printjob {
 	time_t starttime; /* when the job started spooling */
 	int status; /* the status of this job */
 	size_t size; /* the size of the job so far */
+	int page_count;	/* then number of pages so far */
 	BOOL spooled; /* has it been sent to the spooler yet? */
 	BOOL smbjob; /* set if the job is a SMB job */
 	fstring filename; /* the filename used to spool the file */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 02645f35d3..34832edc79 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -506,6 +506,7 @@ typedef struct _print_queue_struct
 {
   int job;
   int size;
+  int page_count;
   int status;
   int priority;
   time_t time;