Fixed compilation problems in uae_service

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

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;