From: msweet Date: Fri, 9 May 2014 20:52:03 +0000 (+0000) Subject: The CUPS headers incorrectly needed libdispatch for blocks support (STR #4397) X-Git-Tag: v2.2b1~639 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f46ff54cd64cdb87ed6c5fb01bfec027e3cd1e;p=thirdparty%2Fcups.git 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 8a56059471..1fb268c661 100644 --- 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 1d8ca6ae3d..25dd43365a 100644 --- 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 -# endif /* __BLOCKS__ */ - # include "file.h" # include "ipp.h" # include "language.h"