Merge changes from CUPS 1.5svn-r9049 (private header support)

[thirdparty/cups.git] / cups / http.c

diff --git a/cups/http.c b/cups/http.c
index 084e88e9b03bc425a9bbdde999a8f81ec5862712..3951b1feebfa13cbfe67b5b55387b2a40452a5dc 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $"
  *
- *   HTTP routines for the Common UNIX Printing System (CUPS).
+ *   HTTP 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.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -96,12 +96,8 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
+#include "cups-private.h"
 #include <fcntl.h>
-#include <errno.h>
 #ifndef WIN32
 #  include <signal.h>
 #  include <sys/time.h>