Merge pull request #50 from jsakkine-intel/master

Fixes for various compilation issues

Author: lzha101

external/vtune/linux/sdk/src/ittnotify/ittnotify_static.c

@@ -284,7 +284,7 @@ __itt_global _N_(_ittapi_global) = {
     __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_fini_t)(__itt_global*);
 
@@ -829,12 +829,12 @@ static __itt_group_id __itt_get_groups(void)
 
     if (group_str != NULL)
     {
-        int len;
+        unsigned int len;
         char gr[255];
         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);
             gr[min_len] = 0;
 

psw/uae_service/linux/Makefile

@@ -57,7 +57,18 @@ INCLUDE += -I$(LINUX_EXTERNAL_DIR)/epid     \
            -I$(IPC_COMMON_PROTO_DIR) \
            -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 
 

psw/uae_service/uae_wrapper/inc/AEServices.h

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

sdk/cpprt/Makefile

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