From: Günther Deschner <gd@samba.org>
Date: Thu, 24 Feb 2011 11:03:19 +0000 (+0100)
Subject: s3-printing: move more printing defines out of includes.h
X-Git-Tag: tevent-0.9.11~309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de8b373329931c921d95bf4f622d5713675288d9;p=thirdparty%2Fsamba.git

s3-printing: move more printing defines out of includes.h

Guenther
---

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 348dda149e2..2d6e1e7551d 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 72c9cef7c0f..3752b9c3b11 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