Experimental Physics and Industrial Control System
On Monday, November 21, 2011, Andrew Johnson wrote:
> On 2011-11-18 Benjamin Franksen wrote:
> > It may be a bit late but I have attached a very small patch that adds
> > an option -b to dbExpand to enable the relaxed breakpoint table
> > checking on the host side. Please consider merging this into
> > R3.14.12.2.
>
> Merged, thanks.
Compiling this under windows gives a link error 'symbol dbBptNotMonotonic
not defined'. See https://bugs.launchpad.net/bugs/894276. The solution is to
properly declare this variable in a header file (dbStaticLib.h) with
epicsShareExtern (is the cleaner solution anyway). A patch for this fix is
attached. It solves the problem on Windows for me (32bit VM).
Cheers
Ben
PS: I would have attached the patch together with a comment to the bug
report in the tracker but I could not see how to do that.
________________________________
Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
Mitglied der Hermann von Helmholtz-Gemeinschaft Deutscher Forschungszentren e.V.
Aufsichtsrat: Vorsitzender Prof. Dr. Dr. h.c. mult. Joachim Treusch, stv. Vorsitzende Dr. Beatrix Vierkorn-Rudolph
Geschäftsführer: Prof. Dr. Anke Rita Kaysser-Pyzalla, Dr. Ulrich Breuer
Sitz Berlin, AG Charlottenburg, 89 HRB 5583
Postadresse:
Hahn-Meitner-Platz 1
D-14109 Berlin
http://www.helmholtz-berlin.de
diff -rN -u old-baseR3.14.12.2/src/dbStatic/dbExpand.c new-baseR3.14.12.2/src/dbStatic/dbExpand.c
--- old-baseR3.14.12.2/src/dbStatic/dbExpand.c 2011-11-25 11:35:06.000000000 +0100
+++ new-baseR3.14.12.2/src/dbStatic/dbExpand.c 2011-11-25 11:35:07.000000000 +0100
@@ -52,7 +52,6 @@
--argc;
while ((argc > 1) && (**argv == '-')) {
- extern int dbBptNotMonotonic;
char optLtr = (*argv)[1];
char *optArg;
diff -rN -u old-baseR3.14.12.2/src/dbStatic/dbStaticLib.h new-baseR3.14.12.2/src/dbStatic/dbStaticLib.h
--- old-baseR3.14.12.2/src/dbStatic/dbStaticLib.h 2011-11-25 11:35:06.000000000 +0100
+++ new-baseR3.14.12.2/src/dbStatic/dbStaticLib.h 2011-11-25 11:35:07.000000000 +0100
@@ -74,6 +74,8 @@
epicsShareFunc void epicsShareAPI dbCopyEntryContents(DBENTRY *pfrom,
DBENTRY *pto);
+epicsShareExtern int dbBptNotMonotonic;
+
epicsShareFunc long epicsShareAPI dbReadDatabase(DBBASE **ppdbbase,
const char *filename, const char *path, const char *substitutions);
epicsShareFunc long epicsShareAPI dbReadDatabaseFP(DBBASE **ppdbbase,
- Replies:
- Re: EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- References:
- EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- Re: EPICS Base 3.14.12.2-pre1 available for testing Benjamin Franksen
- Re: EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- Navigate by Date:
- Prev:
Contribtions for R3.14.12.2-rc1 Andrew Johnson
- Next:
Re: EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
<2011>
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- Next:
Re: EPICS Base 3.14.12.2-pre1 available for testing Andrew Johnson
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
<2011>
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024