Bug 882968 - Clean up and move DEFINES and friends to moz.build in comm-central - Part 2: mailnews/mapi files r=cranmer for a CLOSED TREE

mailnews/mapi/mapiDll/Makefile.in

@@ -21,5 +21,3 @@ endif
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
-
-DEFINES	+= -DUNICODE -D_UNICODE

mailnews/mapi/mapiDll/moz.build

@@ -14,4 +14,8 @@ FORCE_SHARED_LIB = True
 OS_LIBS += [
     'ole32',
 ]
+
+DEFINES['UNICODE'] = True
+DEFINES['_UNICODE'] = True
+
 DEFFILE	= SRCDIR + '/Mapi32.def'

mailnews/mapi/mapihook/build/Makefile.in

@@ -35,8 +35,6 @@ CSRCS += \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400
-
 $(MIDL_GENERATED_FILES): done_gen
 
 done_gen: msgMapi.idl

mailnews/mapi/mapihook/build/moz.build

@@ -10,4 +10,10 @@ FORCE_SHARED_LIB = True
 OS_LIBS += [
     'rpcrt4',
 ]
+
+for var in ('REGISTER_PROXY_DLL', 'UNICODE', '_UNICODE'):
+    DEFINES[var] = True
+
+DEFINES['_WIN32_WINNT'] = '0x400'
+
 DEFFILE = SRCDIR + '/MapiProxy.def'

mailnews/mapi/mapihook/src/Makefile.in

@@ -13,5 +13,3 @@ include $(DEPTH)/config/autoconf.mk
 CSRCS += ../build/msgMapi_i.c
 
 include $(topsrcdir)/config/rules.mk
-
-DEFINES	+= -DUNICODE -D_UNICODE

mailnews/mapi/mapihook/src/moz.build

@@ -22,3 +22,6 @@ else:
 OS_LIBS += [
     'ole32',
 ]
+
+DEFINES['UNICODE'] = True
+DEFINES['_UNICODE'] = True