------------------------------------------------------------ revno: 11785 revision-id: squid3@treenet.co.nz-20130216022911-v1yaiyod1f7udo3f parent: squid3@treenet.co.nz-20130216022801-tvwdf0kps32vustk committer: Amos Jeffries branch nick: 3.2 timestamp: Fri 2013-02-15 19:29:11 -0700 message: Solaris: Fix xstrto*() function linkages These functions are only used by C++ code now and can be hidden from the .c files. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130216022911-v1yaiyod1f7udo3f # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 5dbf4f4cfb36546be3ec2c8af0f9159cb8cc5e6d # timestamp: 2013-02-16 02:30:24 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20130216022801-\ # tvwdf0kps32vustk # # Begin patch === modified file 'compat/xstrto.h' --- compat/xstrto.h 2010-11-21 09:24:35 +0000 +++ compat/xstrto.h 2013-02-16 02:29:11 +0000 @@ -1,6 +1,9 @@ #ifndef _SQUID_XSTRTO_H #define _SQUID_XSTRTO_H +// these functions are not used by the remaining Squid C code. +#if defined(__cplusplus) + #if HAVE_STDBOOL_H #include #endif @@ -27,4 +30,5 @@ bool xstrtoui(const char *s, char **end, unsigned int *value, unsigned int min, unsigned int max); +#endif /* __cplusplus */ #endif /* _SQUID_XSTRTO_H */