From c2e2949ce4a6c546aff91d4d907f45288b6f4f2a Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 10 Dec 2013 20:45:53 -0500
Subject: [PATCH] compatibility

---
 devsupApp/src/setup.c     | 6 ++++++
 logApp/src/inotify_wrap.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/devsupApp/src/setup.c b/devsupApp/src/setup.c
index c444e73..c978bb2 100644
--- a/devsupApp/src/setup.c
+++ b/devsupApp/src/setup.c
@@ -240,7 +240,9 @@ PyMODINIT_FUNC init_dbconstants(void)
 
     /* standard macros from epicsVersion.h */
     PyModule_AddStringMacro(mod, EPICS_VERSION_STRING);
+#ifdef EPICS_DEV_SNAPSHOT
     PyModule_AddStringMacro(mod, EPICS_DEV_SNAPSHOT);
+#endif
     PyModule_AddStringMacro(mod, EPICS_SITE_VERSION);
     PyModule_AddIntMacro(mod, EPICS_VERSION);
     PyModule_AddIntMacro(mod, EPICS_REVISION);
@@ -258,7 +260,11 @@ PyMODINIT_FUNC init_dbconstants(void)
                            (int)EPICS_MODIFICATION,
                            (int)EPICS_PATCH_LEVEL,
                            EPICS_SITE_VERSION,
+#ifdef EPICS_DEV_SNAPSHOT
                            EPICS_DEV_SNAPSHOT);
+#else
+                           "");
+#endif
     if(vertup)
         PyModule_AddObject(mod, "epicsver", vertup);
     Py_XDECREF(vertup);
diff --git a/logApp/src/inotify_wrap.c b/logApp/src/inotify_wrap.c
index 5be04e8..248afee 100644
--- a/logApp/src/inotify_wrap.c
+++ b/logApp/src/inotify_wrap.c
@@ -258,9 +258,11 @@ PyMODINIT_FUNC init_inotifyy(void)
 
     PyModule_AddIntMacro(mod, IN_ALL_EVENTS);
 
-    PyModule_AddIntMacro(mod, IN_EXCL_UNLINK);
     PyModule_AddIntMacro(mod, IN_ONESHOT);
     /* added in glibc 2.5 */
+#ifdef IN_EXCL_UNLINK
+    PyModule_AddIntMacro(mod, IN_EXCL_UNLINK);
+#endif
 #ifdef IN_DONT_FOLLOW
     PyModule_AddIntMacro(mod, IN_DONT_FOLLOW);
 #endif