Skip to content

Commit

Permalink
Merge pull request #1304 from Azure/FixForiOS
Browse files Browse the repository at this point in the history
Remove incorrect const qualifier in serializer methodreturn
  • Loading branch information
ewertons authored Nov 8, 2019
2 parents d39618b + 2997e52 commit 241b66e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 2 additions & 5 deletions serializer/inc/methodreturn.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ typedef struct METHODRETURN_HANDLE_DATA_TAG* METHODRETURN_HANDLE;

#include "azure_macro_utils/macro_utils.h"

/*the following macro expands to "const" if X is defined. If X is not defined, then it expands to nothing*/
#define CONST_BY_COMPILATION_UNIT(X) MU_IF(MU_COUNT_ARG(X),const,)

typedef struct METHODRETURN_DATA_TAG
{
CONST_BY_COMPILATION_UNIT(METHODRETURN_C) int statusCode;
CONST_BY_COMPILATION_UNIT(METHODRETURN_C) char* jsonValue;
int statusCode;
char* jsonValue;
}METHODRETURN_DATA;

#include "umock_c/umock_c_prod.h"
Expand Down
2 changes: 0 additions & 2 deletions serializer/src/methodreturn.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
#include "azure_c_shared_utility/strings.h"
#include "parson.h"

#define METHODRETURN_C
#include "methodreturn.h"
#undef METHODRETURN_C

typedef struct METHODRETURN_HANDLE_DATA_TAG
{
Expand Down

0 comments on commit 241b66e

Please sign in to comment.