The Samba-Bugzilla – Attachment 2993 Details for
Bug 5101
libreplace merge changed handling of default print system
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to restore 3.0.24 print system selection
cups.patch (text/plain), 1.87 KB, created by
Steve Langasek
on 2007-11-23 12:44:10 UTC
(
hide
)
Description:
patch to restore 3.0.24 print system selection
Filename:
MIME Type:
Creator:
Steve Langasek
Created:
2007-11-23 12:44:10 UTC
Size:
1.87 KB
patch
obsolete
>commit 5e21dd2e69330ac3b51f485e7f8c1b7711e9e69d >Author: Steve Langasek <vorlon@debian.org> >Date: Thu Nov 22 18:21:14 2007 -0800 > > restore print system selection from 3.0.24, so that cups is again treated as > the default print system when it's available > >diff --git a/source/include/includes.h b/source/include/includes.h >index 2e82070..1f57655 100644 >--- a/source/include/includes.h >+++ b/source/include/includes.h >@@ -53,19 +53,6 @@ > > #include "local.h" > >-#ifdef AIX >-#define DEFAULT_PRINTING PRINT_AIX >-#define PRINTCAP_NAME "/etc/qconfig" >-#endif >- >-#ifdef HPUX >-#define DEFAULT_PRINTING PRINT_HPUX >-#endif >- >-#ifdef QNX >-#define DEFAULT_PRINTING PRINT_QNX >-#endif >- > #ifdef SUNOS4 > /* on SUNOS4 termios.h conflicts with sys/ioctl.h */ > #undef HAVE_TERMIOS_H >@@ -806,23 +793,6 @@ enum flush_reason_enum { > #define QSORT_CAST (int (*)(const void *, const void *)) > #endif > >-#ifndef DEFAULT_PRINTING >-#ifdef HAVE_CUPS >-#define DEFAULT_PRINTING PRINT_CUPS >-#define PRINTCAP_NAME "cups" >-#elif defined(SYSV) >-#define DEFAULT_PRINTING PRINT_SYSV >-#define PRINTCAP_NAME "lpstat" >-#else >-#define DEFAULT_PRINTING PRINT_BSD >-#define PRINTCAP_NAME "/etc/printcap" >-#endif >-#endif >- >-#ifndef PRINTCAP_NAME >-#define PRINTCAP_NAME "/etc/printcap" >-#endif >- > #ifndef SIGCLD > #define SIGCLD SIGCHLD > #endif >diff --git a/source/lib/replace/system/printing.h b/source/lib/replace/system/printing.h >index 7eb02d0..b20ff5f 100644 >--- a/source/lib/replace/system/printing.h >+++ b/source/lib/replace/system/printing.h >@@ -41,8 +41,18 @@ > #endif > > #ifndef DEFAULT_PRINTING >+#ifdef HAVE_CUPS >+#define DEFAULT_PRINTING PRINT_CUPS >+#define PRINTCAP_NAME "cups" >+#elif defined(SYSV) >+#define DEFAULT_PRINTING PRINT_SYSV >+#define PRINTCAP_NAME "lpstat" >+#else > #define DEFAULT_PRINTING PRINT_BSD >+#define PRINTCAP_NAME "/etc/printcap" >+#endif > #endif >+ > #ifndef PRINTCAP_NAME > #define PRINTCAP_NAME "/etc/printcap" > #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 5101
: 2993