Merge changes from CUPS 1.6svn-r9939.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3392 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 67 insertions, 0 deletions

diff --git a/cups/raster-private.h b/cups/raster-private.h
new file mode 100644
index 000000000..0a1996c5c
--- /dev/null
+++ b/cups/raster-private.h
@@ -0,0 +1,67 @@
+/*
+ * "$Id$"
+ *
+ *   Private image library definitions for CUPS.
+ *
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1993-2006 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_RASTER_PRIVATE_H_
+#  define _CUPS_RASTER_PRIVATE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include "raster.h"
+#  include <cups/cups.h>
+#  include <cups/debug-private.h>
+#  include <cups/string-private.h>
+#  ifdef WIN32
+#    include <io.h>
+#    include <winsock2.h>		/* for htonl() definition */
+#  else
+#    include <unistd.h>
+#    include <fcntl.h>
+#  endif /* WIN32 */
+
+
+/*
+ * min/max/abs macros...
+ */
+
+#  ifndef max
+#    define 	max(a,b)	((a) > (b) ? (a) : (b))
+#  endif /* !max */
+#  ifndef min
+#    define 	min(a,b)	((a) < (b) ? (a) : (b))
+#  endif /* !min */
+#  ifndef abs
+#    define	abs(a)		((a) < 0 ? -(a) : (a))
+#  endif /* !abs */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int		_cupsRasterExecPS(cups_page_header2_t *h,
+			                  int *preferred_bits,
+			                  const char *code);
+extern void		_cupsRasterAddError(const char *f, ...);
+extern void		_cupsRasterClearError(void);
+
+#endif /* !_CUPS_RASTER_PRIVATE_H_ */
+
+/*
+ * End of "$Id$".
+ */