summaryrefslogtreecommitdiff
path: root/cups/globals.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
commit71e160228f56370c40a47637d85d07c230052e86 (patch)
tree00d1c9b78a365ca7518f7bba195275135e6e3430 /cups/globals.c
parent54afec335014303dba3c6eabe5393adce9e660ad (diff)
downloadcups-71e160228f56370c40a47637d85d07c230052e86.tar.gz
Merge changes from CUPS 1.5svn-r9049 (private header support)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1992 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/globals.c')
-rw-r--r--cups/globals.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/cups/globals.c b/cups/globals.c
index 8207312ce..3353604d3 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,9 +1,9 @@
/*
* "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $"
*
- * Global variable access routines for the Common UNIX Printing System (CUPS).
+ * Global variable access routines for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -26,9 +26,7 @@
* Include necessary headers...
*/
-#include "http-private.h"
-#include "globals.h"
-#include <stdlib.h>
+#include "cups-private.h"
/*