The CUPS headers incorrectly needed libdispatch for blocks support (STR #4397)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11869 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 8a5605947125b54e1586661360c6f962340cd86a..1fb268c661d73666332731c4fea7332f457508b6 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -15,6 +15,8 @@ CHANGES IN CUPS V1.7.3
        - Fixed an authentication race condition in cupsSendRequest (STR #4403)
        - The scheduler did not add the "job-hold-until-specified" reason when
          holding a job using the lp command (STR #4405)
+       - The CUPS headers incorrectly needed libdispatch for blocks support
+         (STR #4397)
 
 
 CHANGES IN CUPS V1.7.2

diff --git a/cups/cups.h b/cups/cups.h
index 1d8ca6ae3dea146b03cef45f245381c354c28b16..25dd43365a0f168cca4e68eeab75a9f4e0b84518 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,18 +1,18 @@
 /*
  * "$Id$"
  *
- *   API definitions for CUPS.
+ * API definitions for CUPS.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 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/".
+ * 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.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_CUPS_H_
@@ -30,10 +30,6 @@
 typedef off_t ssize_t;                 /* @private@ */
 #  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
-#  ifdef __BLOCKS__
-#    include <dispatch/dispatch.h>
-#  endif /* __BLOCKS__ */
-
 #  include "file.h"
 #  include "ipp.h"
 #  include "language.h"