From 0945863e40046704eda3c869c68432cbc838f531 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 6 Nov 2008 22:12:05 +0000
Subject: [PATCH] Blocked revisions 155079-155080 via svnmerge

........
  r155079 | kpfleming | 2008-11-06 15:09:24 -0600 (Thu, 06 Nov 2008) | 3 lines

  make S_OR and S_COR safe to use even if the parameters are function calls or have side effects. it still bothers me that these are called S_OR and not something like ast_string_or, but that's water over the bridge
........
  r155080 | kpfleming | 2008-11-06 15:12:03 -0600 (Thu, 06 Nov 2008) | 3 lines

  coding style/guidelines cleanup, plus use new side-effect safe S_OR
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@155115 65c4cc65-6c06-0410-ace0-fbb531ad65f3