summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-09-18 19:06:58 +0000
committerGerald Carter <jerry@samba.org>2002-09-18 19:06:58 +0000
commitaad3c35ac1197a70c04eccaf7d4fee804a210954 (patch)
treed5b428fc468f838a38445ec3c24c7b258f112be7 /source3/include
parent6c665675009c2da25a57fb9f681e29731099ed4f (diff)
downloadsamba-aad3c35ac1197a70c04eccaf7d4fee804a210954.tar.gz
samba-aad3c35ac1197a70c04eccaf7d4fee804a210954.tar.bz2
samba-aad3c35ac1197a70c04eccaf7d4fee804a210954.zip
printjob merge from APP_HEAD regarding device modes
(This used to be commit aa52351384abace54a89c9fbfa5e4c31a8464c91)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h5
-rw-r--r--source3/include/printing.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index bdf5bbcef3..56b8357831 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -803,6 +803,11 @@ struct functable {
#include "nsswitch/nss.h"
+/* forward declaration from printing.h to get around
+ header file dependencies */
+
+struct printjob;
+
/***** automatically generated prototypes *****/
#include "proto.h"
diff --git a/source3/include/printing.h b/source3/include/printing.h
index ecf603b8fc..9774a6acd9 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -43,6 +43,7 @@ struct printjob {
fstring jobname; /* the job name given to us by the client */
fstring user; /* the user who started the job */
fstring queuename; /* service number of printer for this job */
+ NT_DEVICEMODE *nt_devmode;
};
/* Information for print interfaces */