summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-04-03 20:31:36 +0000
committersruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-04-03 20:31:36 +0000
commit18c27fc575b8195d5a850b885cc94459b21743c3 (patch)
tree67b6db331633c68149bdadb677c1bddc6bec39a1
parent78ba1b383b6caae696d7881290de9a3f252aafd8 (diff)
Moving a macro to quiet a compiler warning.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4127 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--xpp/card_fxo.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/xpp/card_fxo.c b/xpp/card_fxo.c
index 34fc41c..179ff70 100644
--- a/xpp/card_fxo.c
+++ b/xpp/card_fxo.c
@@ -555,6 +555,11 @@ static int FXO_card_hooksig(xbus_t *xbus, xpd_t *xpd, int pos, zt_txsig_t txsig)
return ret;
}
+#ifndef ZT_GET_PARAMS_V1
+#define zt_alarm_channel(a,b) zt_qevent_lock(a,( (b)==ZT_ALARM_NONE )? \
+ ZT_EVENT_NOALARM : ZT_EVENT_ALARM)
+#endif
+
static void zap_report_battery(xpd_t *xpd, lineno_t chan)
{
struct FXO_priv_data *priv;
@@ -816,10 +821,6 @@ HANDLER_DEF(FXO, SIG_CHANGED)
return 0;
}
-#ifndef ZT_GET_PARAMS_V1
-#define zt_alarm_channel(a,b) zt_qevent_lock(a,( (b)==ZT_ALARM_NONE )? \
- ZT_EVENT_NOALARM : ZT_EVENT_ALARM)
-#endif
static void update_battery_voltage(xpd_t *xpd, byte data_low, lineno_t chipsel)
{
struct FXO_priv_data *priv;