hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
2.0 used old define names.
This commit is contained in:
Markus Mäkelä
2017-02-20 12:41:52 +02:00
parent e7c7caebad
commit aa412b4fe3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
avro/maxavro_file.c
View File

@ -12,7 +12,6 @@
*/ */
#include "maxavro.h" #include "maxavro.h"
#include "skygw_utils.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <maxscale/log_manager.h> #include <maxscale/log_manager.h>
@ -52,7 +51,7 @@ bool maxavro_verify_block(MAXAVRO_FILE *file)
{ {
if (ferror(file->file)) if (ferror(file->file))
{ {
char err[STRERROR_BUFLEN]; char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read file: %d %s", errno, strerror_r(errno, err, sizeof(err))); MXS_ERROR("Failed to read file: %d %s", errno, strerror_r(errno, err, sizeof(err)));
} }
else if (rc > 0 || !feof(file->file)) else if (rc > 0 || !feof(file->file))