diff options
| author | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
| commit | 81ab83f382660bc7980ae954725c4ebf28764b03 (patch) | |
| tree | 523268f698a63a8fd44f3491d94d140266b2403b /config.h.in | |
| parent | a75966e33dbc3e3e096338fd332f515cb313b58a (diff) | |
| download | cups-81ab83f382660bc7980ae954725c4ebf28764b03.tar.gz | |
Imported Upstream version 1.6.0upstream/1.6.0
Diffstat (limited to 'config.h.in')
| -rw-r--r-- | config.h.in | 81 |
1 files changed, 34 insertions, 47 deletions
diff --git a/config.h.in b/config.h.in index 1d1c7f4a..904083e8 100644 --- a/config.h.in +++ b/config.h.in @@ -1,9 +1,9 @@ /* - * "$Id: config.h.in 10371 2012-03-21 04:45:48Z mike $" + * "$Id: config.h.in 10548 2012-07-16 18:21:43Z mike $" * * Configuration file for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -62,12 +62,8 @@ */ #define CUPS_DEFAULT_BROWSING 1 -#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "CUPS" -#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "CUPS" -#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 1 /* @@ -350,13 +346,6 @@ /* - * Do we have the SSLSetProtocolVersionMax function? - */ - -#undef HAVE_SSLSETPROTOCOLVERSIONMAX - - -/* * Do we have the cssmErrorString function? */ @@ -364,36 +353,24 @@ /* - * 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 +#undef HAVE_DNSSD /* - * Do we have libpaper? + * Do we have Avahi for DNS Service Discovery (aka Bonjour)? */ -#undef HAVE_LIBPAPER - - -/* - * Do we have DNS Service Discovery (aka Bonjour)? - */ - -#undef HAVE_DNSSD +#undef HAVE_AVAHI /* @@ -535,14 +512,6 @@ /* - * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks? - */ - -#undef HAVE_COREFOUNDATION -#undef HAVE_SYSTEMCONFIGURATION - - -/* * Do we have CoreFoundation public and private headers? */ @@ -566,7 +535,7 @@ /* - * Do we have Mac OS X 10.4's mbr_XXX functions? + * Do we have OS X 10.4's mbr_XXX functions? */ #undef HAVE_MEMBERSHIP_H @@ -728,28 +697,46 @@ /* - * Location of Mac OS X localization bundle, if any. + * Location of OS X localization bundle, if any. */ #undef CUPS_BUNDLEDIR /* - * 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_ */ /* - * End of "$Id: config.h.in 10371 2012-03-21 04:45:48Z mike $". + * End of "$Id: config.h.in 10548 2012-07-16 18:21:43Z mike $". */ |