diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
| commit | f3c17241a42a0845eae2099e6970b5aca9bbd836 (patch) | |
| tree | e511e108810d2b80f72ff6cee5efafba472beb6a /config.h.in | |
| parent | 271780fb877d849c9f41616f338e1e9dd2d69409 (diff) | |
| download | cups-f3c17241a42a0845eae2099e6970b5aca9bbd836.tar.gz | |
Merge changes from CUPS 1.6svn-r10437.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config.h.in')
| -rw-r--r-- | config.h.in | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/config.h.in b/config.h.in index 4081f7db8..32a2d715c 100644 --- a/config.h.in +++ b/config.h.in @@ -569,7 +569,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 @@ -731,7 +731,7 @@ /* - * Location of Mac OS X localization bundle, if any. + * Location of OS X localization bundle, if any. */ #undef CUPS_BUNDLEDIR @@ -752,6 +752,23 @@ #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_ */ /* |