From 1a7471f0e4bc50c667333f8e5c4ca68a44469c78 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Wed, 1 Apr 2015 09:39:13 +0000
Subject: [PATCH] bugfixes for 64bit
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6966 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/EMOS/LTE/IMPORT_FILTER/Makefile | 2 +-
openair1/EMOS/LTE/IMPORT_FILTER/MatlabCStruct.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile
index da66cace6e3..a2d3a5c6cb6 100644
--- a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile
+++ b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile
@@ -4,7 +4,7 @@ SRC = dump_size.c
#CFLAGS = $(shell rtai-config --lxrt-cflags)
#LDFLAGS = $(shell rtai-config --lxrt-ldflags) -lpthread -lm -lgps -lforms #-llxrt
-CFLAGS += -m32 -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES -I$(OPENAIR_HOME)/common/utils -I$(OPENAIR2_DIR) -I$(OPENAIR2_DIR)/COMMON
+CFLAGS += -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES -I$(OPENAIR_HOME)/common/utils -I$(OPENAIR2_DIR) -I$(OPENAIR2_DIR)/COMMON
CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1
diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/MatlabCStruct.c b/openair1/EMOS/LTE/IMPORT_FILTER/MatlabCStruct.c
index 0b924d57a64..79c87b7404b 100644
--- a/openair1/EMOS/LTE/IMPORT_FILTER/MatlabCStruct.c
+++ b/openair1/EMOS/LTE/IMPORT_FILTER/MatlabCStruct.c
@@ -159,8 +159,8 @@ ELEMENT_ATTRIBUTES MatlabCStruct(const mxArray *pArray, int MemoryAlignment, int
case mxUINT8_CLASS : Attributes.ElementSize = sizeof(unsigned char); break;
case mxINT16_CLASS : Attributes.ElementSize = sizeof(short); break;
case mxUINT16_CLASS : Attributes.ElementSize = sizeof(unsigned short); break;
- case mxINT32_CLASS : Attributes.ElementSize = sizeof(long); break;
- case mxUINT32_CLASS : Attributes.ElementSize = sizeof(unsigned long); break;
+ case mxINT32_CLASS : Attributes.ElementSize = sizeof(int); break;
+ case mxUINT32_CLASS : Attributes.ElementSize = sizeof(unsigned int); break;
// case mxINT64_CLASS : Attributes.ElementSize = sizeof(__int64); break;
case mxINT64_CLASS : Attributes.ElementSize = sizeof(INT64_T); break; // jaj 05/24/2004
default: mexErrMsgTxt("Unknown MX class");
--
GitLab