From f146f9ea6e632673774e7d35e2279f6ae11ab0b3 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 12 Nov 2013 16:18:17 -0600
Subject: [PATCH] Move the string array declarations into alarm.h

This also removes all internal use of alarmString.h which
is now deprecated again (see 3.14.5, Jan 2004).
---
 src/ca/client/perl/Cap5.xs     |  1 -
 src/ca/client/tools/tool_lib.c |  1 -
 src/libCom/misc/alarm.h        |  8 +++++++-
 src/libCom/misc/alarmString.c  |  1 -
 src/libCom/misc/alarmString.h  | 16 +++++++---------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/ca/client/perl/Cap5.xs b/src/ca/client/perl/Cap5.xs
index 54ce8decb..e0b9f3650 100644
--- a/src/ca/client/perl/Cap5.xs
+++ b/src/ca/client/perl/Cap5.xs
@@ -11,7 +11,6 @@
 #include "cadef.h"
 #include "db_access.h"
 #include "alarm.h"
-#include "alarmString.h"
 
 typedef union {
     dbr_long_t iv;
diff --git a/src/ca/client/tools/tool_lib.c b/src/ca/client/tools/tool_lib.c
index 45aa6d92e..b503e125a 100644
--- a/src/ca/client/tools/tool_lib.c
+++ b/src/ca/client/tools/tool_lib.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <alarm.h>
-#include <alarmString.h>
 #include <epicsTime.h>
 #include <epicsString.h>
 #include <cadef.h>
diff --git a/src/libCom/misc/alarm.h b/src/libCom/misc/alarm.h
index 6494e9374..5158206f7 100644
--- a/src/libCom/misc/alarm.h
+++ b/src/libCom/misc/alarm.h
@@ -95,9 +95,15 @@ typedef enum {
 #define WRITE_ACCESS_ALARM  epicsAlarmWriteAccess
 #define lastEpicsAlarmCond  epicsAlarmWriteAccess
 
+
+/* Name string arrays */
+
+epicsShareExtern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
+epicsShareExtern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
+
+
 #ifdef __cplusplus
 }
 #endif
 
-
 #endif /* INC_alarm_H */
diff --git a/src/libCom/misc/alarmString.c b/src/libCom/misc/alarmString.c
index 0c668c888..b8c72451c 100644
--- a/src/libCom/misc/alarmString.c
+++ b/src/libCom/misc/alarmString.c
@@ -12,7 +12,6 @@
 
 #define epicsExportSharedSymbols
 #include "alarm.h"
-#include "alarmString.h"
 
 /* ALARM SEVERITIES - must match menuAlarmSevr.dbd and alarm.h */
 
diff --git a/src/libCom/misc/alarmString.h b/src/libCom/misc/alarmString.h
index bfe6d8b2e..75fe2317c 100644
--- a/src/libCom/misc/alarmString.h
+++ b/src/libCom/misc/alarmString.h
@@ -8,29 +8,27 @@
 \*************************************************************************/
 /* $Revision-Id$ */
 
-/* String names for alarm status and severity values */
+/*
+ * This file is deprecated, use alarm.h instead.
+ *
+ * Old string names for alarm status and severity values
+ */
 
 #ifndef INC_alarmString_H
 #define INC_alarmString_H
 
-#include "shareLib.h"
+#include "alarm.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* An older version of alarmString.h used these names: */
+/* Old versions of alarmString.h defined these names: */
 
 #define alarmSeverityString epicsAlarmSeverityStrings
 #define alarmStatusString epicsAlarmConditionStrings
 
 
-/* Name string arrays */
-
-epicsShareExtern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
-epicsShareExtern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
-
-
 #ifdef __cplusplus
 }
 #endif