Skip to content

Commit

Permalink
unify mexPrintf prototype for newer Octave and Matlab
Browse files Browse the repository at this point in the history
  • Loading branch information
fangq committed Jan 5, 2016
1 parent afa198a commit 9292441
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mmc/trunk/commons/Makefile_common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ MKDIR := mkdir

ARCH = $(shell uname -m)
ifeq ($(findstring x86_64,$(ARCH)), x86_64)
CCFLAGS+=#-m64
CCFLAGS+=-m64
endif

MKMEX :=mex
Expand Down
2 changes: 1 addition & 1 deletion mmc/trunk/src/mcx_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void mcx_version(mcconfig *cfg);
#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_API_VERSION_NUMBER) || defined (HAVE_OCTAVE)
int mexPrintf(const char * format, ... );
#else
void mexPrintf(const char * format, ... );
int mexPrintf(const char * format, ... );
#endif

#define MMCDEBUG(cfg,debugflag,outputstr) {\
Expand Down

0 comments on commit 9292441

Please sign in to comment.