------------------------------------------------------------ revno: 12496 revision-id: squid3@treenet.co.nz-20130214091347-nkfdacfkt0urnwq4 parent: squid3@treenet.co.nz-20130214091310-px2q4jg3c2k4v26n committer: Amos Jeffries branch nick: 3.3 timestamp: Thu 2013-02-14 02:13:47 -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-20130214091347-nkfdacfkt0urnwq4 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 227d98b7c0ef715605ade50559244365b0df909a # timestamp: 2013-02-14 09:15:24 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130214091310-\ # px2q4jg3c2k4v26n # # Begin patch === modified file 'compat/xstrto.h' --- compat/xstrto.h 2010-11-21 04:40:05 +0000 +++ compat/xstrto.h 2013-02-14 09:13:47 +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 */