diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 14:44:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 14:44:10 +0200 |
| commit | 6a78e56277799672b7ac187c57e546836e136f79 (patch) | |
| tree | 87f0336cb1908d01690b74c56a44f4713559b5bc /source3/include/printing.h | |
| parent | ddbddbd80c80b872cdd36a01f9a3a6bc2eca1b1f (diff) | |
| parent | f0a27064869871806343648de3b5a0667118872f (diff) | |
| download | samba-6a78e56277799672b7ac187c57e546836e136f79.tar.gz samba-6a78e56277799672b7ac187c57e546836e136f79.tar.bz2 samba-6a78e56277799672b7ac187c57e546836e136f79.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Diffstat (limited to 'source3/include/printing.h')
| -rw-r--r-- | source3/include/printing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h index 04e30a011b..d91917b528 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -77,7 +77,7 @@ extern struct printif iprint_printif; #define NEXT_JOBID(j) ((j+1) % PRINT_MAX_JOBID > 0 ? (j+1) % PRINT_MAX_JOBID : 1) #define MAX_CACHE_VALID_TIME 3600 -#define CUPS_DEFAULT_TIMEOUT 30 +#define CUPS_DEFAULT_CONNECTION_TIMEOUT 30 #ifndef PRINT_SPOOL_PREFIX #define PRINT_SPOOL_PREFIX "smbprn." |