ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #50 from jsakkine-intel/master

Browse Source 
Fixes for various compilation issues
This commit is contained in:
lzha101 2017-01-16 11:09:42 +08:00 committed by GitHub
commit d89c9abfd2
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/vtune/linux/sdk/src/ittnotify/ittnotify_static.c vendored
View File

@ -284,7 +284,7 @@ __itt_global _N_(_ittapi_global) = {
__itt_collection_normal /* collection state */ __itt_collection_normal /* collection state */
}; };
ITT_EXTERN_C __itt_global* _N_(get_ittapi_global)() { return &_N_(_ittapi_global); } ITT_EXTERN_C __itt_global* _N_(get_ittapi_global)(void) { return &_N_(_ittapi_global); }
typedef void (__itt_api_init_t)(__itt_global*, __itt_group_id); typedef void (__itt_api_init_t)(__itt_global*, __itt_group_id);
typedef void (__itt_api_fini_t)(__itt_global*); typedef void (__itt_api_fini_t)(__itt_global*);
@ -829,12 +829,12 @@ static __itt_group_id __itt_get_groups(void)
if (group_str != NULL) if (group_str != NULL)
{ {
int len; unsigned int len;
char gr[255]; char gr[255];
const char* chunk; const char* chunk;
while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, &len)) != NULL) while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, (int *)&len)) != NULL)
{ {
int min_len = min(len, (int)(sizeof(gr) - 1)); unsigned int min_len = min(len, (int)(sizeof(gr) - 1));
__itt_fstrcpyn(gr, sizeof(gr) - 1, chunk, min_len); __itt_fstrcpyn(gr, sizeof(gr) - 1, chunk, min_len);
gr[min_len] = 0; gr[min_len] = 0;

13
psw/uae_service/linux/Makefile
View File

@ -57,7 +57,18 @@ INCLUDE += -I$(LINUX_EXTERNAL_DIR)/epid \
-I$(IPC_COMMON_PROTO_DIR) \ -I$(IPC_COMMON_PROTO_DIR) \
-I$(LINUX_PSW_DIR)/ae/aesm_service/source -I$(LINUX_PSW_DIR)/ae/aesm_service/source
CXXFLAGS += -fPIC -Werror -g CXXFLAGS += -fPIC -Werror -DPROTOBUF_INLINE_NOT_IN_HEADERS=0
PROTPBUF_CXXFLAGS := -fstack-protector -fPIC -Wall -Werror
ifdef DEBUG
PROTPBUF_CXXFLAGS += -ggdb -DDEBUG -UNDEBUG
else
PROTPBUF_CXXFLAGS += -O2 -UDEBUG -DNDEBUG
endif
ifeq ($(ARCH), x86)
PROTPBUF_CXXFLAGS += -m32
else
PROTPBUF_CXXFLAGS += -m64
endif
EXTERNAL_LIB += -lprotobuf EXTERNAL_LIB += -lprotobuf

1
psw/uae_service/uae_wrapper/inc/AEServices.h
View File

@ -56,7 +56,6 @@ struct PlainData
bool operator==(const PlainData& other) const { bool operator==(const PlainData& other) const {
if (this == &other) return true; if (this == &other) return true;
if (this == NULL || &other == NULL) return false;
if (length != other.length || errorCode != other.errorCode) if (length != other.length || errorCode != other.errorCode)
return false; return false;

3
sdk/cpprt/Makefile
View File

@ -79,9 +79,6 @@ $(CPPRT): $(OBJS) prepare-libunwind libunwind
$(CP) linux/libunwind/src/.libs/libunwind.a $(CPPRT) $(CP) linux/libunwind/src/.libs/libunwind.a $(CPPRT)
$(AR) rs $@ $(OBJS) $(AR) rs $@ $(OBJS)
$(CPPRT): CC = gcc
$(CPPRT): CXX = g++
.PHONY: libunwind .PHONY: libunwind
libunwind: libunwind:
cd linux/libunwind/ && ( test -f Makefile || ./autogen-linux.sh ) && $(MAKE) -j5 cd linux/libunwind/ && ( test -f Makefile || ./autogen-linux.sh ) && $(MAKE) -j5