Fix macro pasting error and duplicate symbol names.

Signed-off-by: David Wohlferd <dw@LimeGreenSocks.com>
This commit is contained in:
David Wohlferd 2016-08-09 22:46:39 -07:00
parent 484ff848da
commit 811680cd9e
2 changed files with 4 additions and 4 deletions

View File

@ -239,7 +239,7 @@ VOID WINAPI DhcpRpcFreeMemory(PVOID BufferPointer);
#define ERROR_DHCP_IPRANGE_CONV_ILLEGAL 20049
#define ERROR_DHCP_NETWORK_CHANGED 20050
#define ERROR_DHCP_CANNOT_MODIFY_BINDINGS 20051
#define ERROR_DHCP_SUBNET_EXISTS 20052
#define ERROR_DHCP_SUBNET_EXISTS_2 20052
#define ERROR_DHCP_MSCOPE_EXISTS 20053
#define ERROR_DHCP_MSCOPE_RANGE_TOO_SMALL 20054
#define ERROR_DHCP_MSCOPE_RANGE_TOO_SMALL 20054
@ -247,7 +247,7 @@ VOID WINAPI DhcpRpcFreeMemory(PVOID BufferPointer);
#define ERROR_DDS_NO_DHCP_ROOT 20071
#define ERROR_DDS_DHCP_SERVER_NOT_FOUND 20074
#define ERROR_DDS_OPTION_ALREADY_EXISTS 20075
#define ERROR_DDS_OPTION_ALREADY_EXISTS 20076
#define ERROR_DDS_OPTION_DOES_NOT_EXIST 20076
#define ERROR_DDS_CLASS_EXISTS 20077
#define ERROR_DDS_CLASS_DOES_NOT_EXIST 20078
#define ERROR_DDS_SERVER_ALREADY_EXISTS 20079

View File

@ -7,9 +7,9 @@
#define __SMTPGUID_H__
#ifdef SMTPINITGUID
#define DECLARE_EVENTGUID_STRING(Name,Value) CONST WCHAR Name##[] = L##Value
#define DECLARE_EVENTGUID_STRING(Name,Value) CONST WCHAR Name[] = L##Value
#else
#define DECLARE_EVENTGUID_STRING(Name,Value) extern CONST WCHAR Name##[]
#define DECLARE_EVENTGUID_STRING(Name,Value) extern CONST WCHAR Name[]
#endif
DECLARE_EVENTGUID_STRING(g_szGuidSmtpSourceType,"{fb65c4dc-e468-11d1-aa67-00c04fa345f6}");