Skip to content

Commit 88d1736

Browse files
committed
Fixes to compile under Clang
1 parent b06c88f commit 88d1736

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

matmef_data.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
// Functions
2828
//
2929

30-
mxArray *read_channel_data_from_path(si1 *channel_path, si1 *password, bool range_type, si8 range_start, si8 range_end);
31-
mxArray *read_channel_data_from_object(CHANNEL *channel, bool range_type, si8 range_start, si8 range_end);
30+
mxArray *read_channel_data_from_path(si1 *channel_path, si1 *password, bool range_type, si8 range_start, si8 range_end, bool apply_conv_factor);
31+
mxArray *read_channel_data_from_object(CHANNEL *channel, bool range_type, si8 range_start, si8 range_end, bool apply_conv_factor);
3232

3333
si8 sample_for_uutc_c(si8 uutc, CHANNEL *channel);
3434
si8 uutc_for_sample_c(si8 sample, CHANNEL *channel);

mex_warninghelper.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
#include "mex_warninghelper.h"
1616
#include <stdarg.h>
17-
17+
#include <string.h>
1818

1919
/**
2020
* Output a warning, regardless of whether warnings
@@ -60,8 +60,8 @@ bool mxIsWarningEnabled(const char* warningId) {
6060
const mxArray* state_field = mxGetField(mxCommandResponse, 0, "state");
6161
if (mxIsChar(state_field)) {
6262
char state_value[8] = {0};
63-
enabled = (0 == mxGetString(state_field, state_value, 8)) &&
64-
(0 == strcmp(state_value,"on"));
63+
enabled = (mxGetString(state_field, state_value, 8) == 0) &&
64+
(strcmp(state_value, "on") == 0);
6565
}
6666
}
6767
mxDestroyArray(mxCommandResponse);

0 commit comments

Comments
 (0)