summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-24 12:03:19 +0100
committerGünther Deschner <gd@samba.org>2011-02-25 01:08:26 +0100
commitde8b373329931c921d95bf4f622d5713675288d9 (patch)
tree49e4e4d07b3aa32ebe954502c08f172705fd4f23 /source3/include
parented3ae87830616503da0348c0c8cde7c624b2322d (diff)
downloadsamba-de8b373329931c921d95bf4f622d5713675288d9.tar.gz
samba-de8b373329931c921d95bf4f622d5713675288d9.tar.bz2
samba-de8b373329931c921d95bf4f622d5713675288d9.zip
s3-printing: move more printing defines out of includes.h
Guenther
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h30
-rw-r--r--source3/include/printing.h30
2 files changed, 30 insertions, 30 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 348dda149e..2d6e1e7551 100644
--- a/source3/include/includes.h
+++ b/source3/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
@@ -705,23 +692,6 @@ enum flush_reason_enum {
/* prototypes from lib/util_transfer_file.c */
#include "transfer_file.h"
-#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/source3/include/printing.h b/source3/include/printing.h
index 72c9cef7c0..3752b9c3b1 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -125,6 +125,36 @@ extern struct printif iprint_printif;
#endif
#define PRINT_DATABASE_VERSION 7
+#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
+
+#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
+
/* There can be this many printing tdb's open, plus any locked ones. */
#define MAX_PRINT_DBS_OPEN 1