Skip to content

Commit

Permalink
Fix problems on Windows dynamic builds, epicsExport.h in wrong place
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkRivers committed Mar 10, 2024
1 parent 484ec37 commit 3f690cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 5 additions & 2 deletions acsMotionApp/src/SPiiPlusCommDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@

#include <iocsh.h>
#include <epicsThread.h>
#include <epicsExport.h>

#include <asynPortDriver.h>
#include <asynOctetSyncIO.h>

#include "asynMotorController.h"
#include "asynMotorAxis.h"

#include <epicsExport.h>

#include "SPiiPlusBinComm.h"
// SPiiPlusDriver.h includes SPiiPlusCommDriver.h
#include "SPiiPlusDriver.h"
Expand Down
5 changes: 2 additions & 3 deletions acsMotionApp/src/SPiiPlusDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@

#include <iocsh.h>
#include <epicsThread.h>
#include <epicsString.h>
#include <cantProceed.h>

#include <asynOctetSyncIO.h>

#include "asynDriver.h"
#include "asynMotorController.h"
#include "asynMotorAxis.h"

#include <epicsExport.h>
#include <epicsString.h>
#include <cantProceed.h>

// SPiiPlusDriver.h includes SPiiPlusCommDriver.h
#include "SPiiPlusDriver.h"
Expand Down

0 comments on commit 3f690cb

Please sign in to comment.