Skip to content

Commit 3d14c3b

Browse files
authored
Merge pull request #37 from xiaoqiangwang/fix_win_build
Fix win build
2 parents a7e2f19 + 30883c8 commit 3d14c3b

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

measCompApp/src/drvMultiFunction.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,9 @@ MultiFunction::MultiFunction(const char *portName, const char *uniqueID, int max
12651265
setIntegerParam(waveDigRun_, 0);
12661266
setIntegerParam(waveGenRun_, 0);
12671267
setDoubleParam(pollSleepMS_, 50.);
1268+
#ifdef linux
12681269
aiInputMode_ = AI_SINGLE_ENDED;
1270+
#endif
12691271
for (i=0; i<numTemperatureIn_; i++) {
12701272
setIntegerParam(i, thermocoupleType_, TC_TYPE_J);
12711273
}

measCompApp/src/measCompDiscover.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "uldaq.h"
1010
#endif
1111

12+
#include <epicsExport.h>
1213
#include <measCompDiscover.h>
1314

1415
#define MAX_DEVICES 100

0 commit comments

Comments
 (0)