From: mike Date: Thu, 24 Jan 2013 17:10:57 +0000 (+0000) Subject: Update config.h for Visual C++. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ec68da1f74149a16a29a17dcb69a5bbb91e5df;p=thirdparty%2Fcups.git Update config.h for Visual C++. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10836 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/config.h.in b/config.h.in index a9807a3f14..cbe612b7c3 100644 --- a/config.h.in +++ b/config.h.in @@ -3,7 +3,7 @@ * * Configuration file for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the diff --git a/vcnet/config.h b/vcnet/config.h index 3b1e1e7030..627aa178cb 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -86,8 +86,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v1.6.0" -#define CUPS_MINIMAL "CUPS/1.6.0" +#define CUPS_SVERSION "CUPS v1.7.0" +#define CUPS_MINIMAL "CUPS/1.7.0" /* @@ -104,7 +104,7 @@ * Default file permissions... */ -#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644 +#define CUPS_DEFAULT_CONFIG_FILE_PERM 0640 #define CUPS_DEFAULT_LOG_FILE_PERM 0644 @@ -128,12 +128,8 @@ */ #define CUPS_DEFAULT_BROWSING 1 -#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS dnssd" -#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "" -#define CUPS_DEFAULT_BROWSE_SHORT_NAMES 1 +#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "" #define CUPS_DEFAULT_DEFAULT_SHARED 1 -#define CUPS_DEFAULT_IMPLICIT_CLASSES 1 -#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 0 /* @@ -172,6 +168,13 @@ #undef CUPS_DEFAULT_DOMAINSOCKET +/* + * Default WebInterface value... + */ + +#undef CUPS_DEFAULT_WEBIF + + /* * Where are files stored? * @@ -194,13 +197,10 @@ /* - * Do we have various image libraries? + * Do we have ZLIB? */ -/* #undef HAVE_LIBPNG */ /* #undef HAVE_LIBZ */ -/* #undef HAVE_LIBJPEG */ -/* #undef HAVE_LIBTIFF */ /* @@ -231,10 +231,10 @@ /* - * Do we have ? + * Use ? */ -/* #undef HAVE_SCSI_SG_H */ +#define HAVE_STDINT_H 1 /* @@ -360,35 +360,25 @@ /* - * What Security framework headers do we have? + * Do we have the SSL_set_tlsext_host_name function? */ -/* #undef HAVE_AUTHORIZATION_H */ -/* #undef HAVE_SECPOLICY_H */ -/* #undef HAVE_SECPOLICYPRIV_H */ -/* #undef HAVE_SECBASEPRIV_H */ -/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ +/* #undef HAVE_SSL_SET_TLSEXT_HOST_NAME */ /* - * Do we have the SecIdentitySearchCreateWithPolicy function? - */ - -/* #undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */ - - -/* - * Do we have the SecPolicyCreateSSL function? - */ - -/* #undef HAVE_SECPOLICYCREATESSL */ - - -/* - * Do we have the SecPolicyCreateSSL function? + * What Security framework headers do we have? */ -/* #undef HAVE_SECPOLICYCREATESSL */ +/* #undef HAVE_AUTHORIZATION_H */ +/* #undef HAVE_SECBASEPRIV_H */ +/* #undef HAVE_SECCERTIFICATE_H */ +/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */ +/* #undef HAVE_SECITEM_H */ +/* #undef HAVE_SECITEMPRIV_H */ +/* #undef HAVE_SECPOLICY_H */ +/* #undef HAVE_SECPOLICYPRIV_H */ +/* #undef HAVE_SECURETRANSPORTPRIV_H */ /* @@ -399,36 +389,31 @@ /* - * Do we have the SLP library? + * Do we have libpaper? */ -/* #undef HAVE_LIBSLP */ +/* #undef HAVE_LIBPAPER */ /* - * Do we have an LDAP library? + * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)? */ -/* #undef HAVE_LDAP */ -/* #undef HAVE_OPENLDAP */ -/* #undef HAVE_MOZILLA_LDAP */ -/* #undef HAVE_LDAP_SSL_H */ -/* #undef HAVE_LDAP_SSL */ -/* #undef HAVE_LDAP_REBIND_PROC */ +#define HAVE_DNSSD 1 /* - * Do we have libpaper? + * Do we have Avahi for DNS Service Discovery (aka Bonjour)? */ -/* #undef HAVE_LIBPAPER */ +#undef HAVE_AVAHI /* - * Do we have DNS Service Discovery (aka Bonjour)? + * Do we have ? */ -#define HAVE_DNSSD 1 +#undef HAVE_SYS_IOCTL_H /* @@ -438,13 +423,6 @@ /* #undef HAVE_ST_GEN */ -/* - * Do we have ? - */ - -/* #undef HAVE_SYS_IOCTL_H */ - - /* * Does the "tm" structure contain the "tm_gmtoff" member? */ @@ -556,6 +534,7 @@ */ /* #undef HAVE_PDFTOPS */ +/* #undef HAVE_PDFTOPS_WITH_ORIGPAGESIZES */ #define CUPS_PDFTOPS "" @@ -567,14 +546,6 @@ #define CUPS_GHOSTSCRIPT "" -/* - * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? - */ - -/* #undef HAVE_COREFOUNDATION */ -/* #undef HAVE_SYSTEMCONFIGURATION */ - - /* * Do we have CoreFoundation public and private headers? */ @@ -639,11 +610,8 @@ /* #undef HAVE_GSS_GSSAPI_H */ /* #undef HAVE_GSS_GSSAPI_SPI_H */ /* #undef HAVE_GSSAPI */ -/* #undef HAVE_GSSAPI_GENERIC_H */ /* #undef HAVE_GSSAPI_GSSAPI_H */ /* #undef HAVE_GSSAPI_H */ -/* #undef HAVE_GSSAPI_KRB5_H */ -/* #undef HAVE_KRB5_H */ /* @@ -731,7 +699,7 @@ * Do we have libusb? */ -/* #undef HAVE_USB_H */ +/* #undef HAVE_LIBUSB */ /* @@ -768,18 +736,36 @@ /* - * Do we have the ColorSyncRegisterDevice function? + * Do we have XPC? */ -/* #undef HAVE_COLORSYNCREGISTERDEVICE */ +/* #undef HAVE_XPC */ +/* #undef HAVE_XPC_PRIVATE_H */ /* - * Do we have XPC? + * Do we have Mini-XML? */ -/* #undef HAVE_XPC */ +/* #undef HAVE_MXML_H */ + + +/* + * Do we have the C99 abs() function? + */ +/* #undef HAVE_ABS */ +#if !defined(HAVE_ABS) && !defined(abs) +# if defined(__GNUC__) || __STDC_VERSION__ >= 199901L +# define abs(x) _cups_abs(x) +static inline int _cups_abs(int i) { return (i < 0 ? -i : i); } +# elif defined(_MSC_VER) +# define abs(x) _cups_abs(x) +static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } +# else +# define abs(x) ((x) < 0 ? -(x) : (x)) +# endif /* __GNUC__ || __STDC_VERSION__ */ +#endif /* !HAVE_ABS && !abs */ #endif /* !_CUPS_CONFIG_H_ */