# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20080822165543-jf2z03p83sw0uj83 # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: e6edddf8c7aba8b6cb76e11c714848d3d67de2fc # timestamp: 2008-08-22 19:04:43 +0200 # base_revision_id: squid3@treenet.co.nz-20080819083732-\ # 5287nm2db3vjc090 # # Begin patch === modified file 'src/squid.h' --- src/squid.h 2008-08-10 05:49:14 +0000 +++ src/squid.h 2008-08-22 16:55:43 +0000 @@ -315,7 +315,7 @@ #define SA_RESETHAND SA_ONESHOT #endif -#if LEACK_CHECK_MODE +#if LEAK_CHECK_MODE #define LOCAL_ARRAY(type,name,size) \ static type *local_##name=NULL; \ type *name = local_##name ? local_##name : \ # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQtD6+8AAY7fgAAQWWP//39O gAC////wUAN7eZUnTGZZgkkSZqTah6nqfopmkaeo0ADRoGno9UCqeaKG1NlGNACBo00yNMT1NDQA kkBE2mpoGqfqjGU09Jo9qJ6mJoANDmAAmAAJgAAAAAJJEZJgyjJplJsmp6Q0B6g0aD0j1Ndcjf5v MMWimGU221xfADQ8dHZb87amcWGbzivzCSWSEAQDz9PCz23An71YBJSMDMPEc5BCBYkI3KaMbGVT Y9vsSdXseg3Y9pZVaZsU9UwrfUoEgNskqpO6ZqAaLsAmZ9j/ajVdAUrXSzYR4J2AtDSKRuEalwM1 Q0aIm/q+Pb/hNqE1I5Ng63dsd3/YwufIeSFjGQ4z4XqVU+RJboCIpbGmLHQpwXoUxLiI4qXa1cxQ LiJE6L9ngKNRiyuE9nTVas1kiJrGIppmNBDascoEBWCwWmlwylIhAUNYTKExxCbS2Egy692yyRiT yXQxtpMB94E6CsWsoJnHFWSMA3lZa8TjJMWGRoPp10GLkPUVQEVgciqLRL4uwBHXzE5f0TG0tMSx OrbV5rjZFMPv11iyn7XrQSLB7aLltT4lBR6C3kYMLvYu1QdIf7m+Gkcyy8jp5Pi4kzns5hRWrfeD DpN2S2bp9sacMGx5JSOI4WtcDq/iaLOO4Y6jkfTidqDhR5cbwf5VOdYnjaLb4KGeBxVCp7OoJ9yo WHMDf6ZmzazTA1MOru5KL/BucgWDnK1PTUD0XqvI7fpW4BudR8wqPKi4zOJxlvIk0rIHC6kL3Uju P3wOZPxO4IHdUbyteMGTI5Yz4egMVbtWS1IIp9Nl4mJkzIpKPLfwtYIet9wHXMXKXn34NIYcWIYD Ix5/fbfWstWhq9CS9EbEpzFuvOkzLEXFAUsBLlfNYBpAuz/00axTp9gubMQtStB8sDUmjoVOC1ab +ceuFVh0qZTG4440dI6zN5vnJmSwJjwfFOKMlzT0OZDLsXDLkykatL5gZwRPILQHK16hT16RTTVF llimIBr3roQgNRnSULctqeHRrjRUr8YpXd8pMn2gXVbXqt+oK4FLDLY6Aw1o7BVHw0AdVFdQL+U2 NQ1acjMW4lxpXhpypKeZg0ryE9B5bMLFPUnKTLZm8s7OJ3pLIV/Rf8t16YDFQFWg4dBX4Ne5zbbV 4idMn/xdyRThQkAtD6+8