From 77574022a109d82edb52a959c11e09b4e89440db Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 9 Sep 2019 16:56:28 -0700
Subject: [PATCH] update RELEASE_NOTES

---
 documentation/RELEASE_NOTES.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 8ed4e04bf..6f2019379 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -16,6 +16,18 @@
 
 <!-- Insert new items immediately below here ... -->
 
+<h3>Add option to avoid CALLBACK conflict</h3>
+
+<p>If a macro EPICS_NO_CALLBACK is defined, then callback.h will no longer (re)define CALLBACK.
+The name 'CALLBACK' is used by the WIN32 API, and redefinition in callback.h cause errors
+if some windows headers are later included.
+</p>
+
+<p>Code which defines EPICS_NO_CALLBACK, but still wishes to use callbacks, should use
+the alternate name 'epicsCallback' introduced in 3.15.6, 3.16.2, and 7.0.2.
+It is also possible, though not encouraged, to use 'struct callbackPvt'
+which has been present since the callback API was introduced.</p>
+
 <h3>Cleaning up with Multiple CA contexts in a Process</h3>
 
 <p>Bruno Martins reported a problem with the CA client library at shutdown in a