Re: [Openvpn-devel] [tap-windows 03/11] cleanup: remove warnings of redefinition of macros
ACK. -- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock > Signed-off-by: Alon Bar-Lev> --- > src/resource.rc |5 + > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/src/resource.rc b/src/resource.rc > index 84884cf..8b2d2f6 100755 > --- a/src/resource.rc > +++ b/src/resource.rc > @@ -4,6 +4,11 @@ > /* get VERSION */ > #include "common.h" > > +#undef VER_PRODUCTVERSION > +#undef VER_PRODUCTVERSION_STR > +#undef VER_COMPANYNAME_STR > +#undef VER_PRODUCTNAME_STR > + > /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR > * and VER_INTERNALNAME_STR must be defined before including COMMON.VER > * The strings don't need a '\0', since common.ver has them.
[Openvpn-devel] [tap-windows 03/11] cleanup: remove warnings of redefinition of macros
Signed-off-by: Alon Bar-Lev--- src/resource.rc |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/resource.rc b/src/resource.rc index 84884cf..8b2d2f6 100755 --- a/src/resource.rc +++ b/src/resource.rc @@ -4,6 +4,11 @@ /* get VERSION */ #include "common.h" +#undef VER_PRODUCTVERSION +#undef VER_PRODUCTVERSION_STR +#undef VER_COMPANYNAME_STR +#undef VER_PRODUCTNAME_STR + /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR * and VER_INTERNALNAME_STR must be defined before including COMMON.VER * The strings don't need a '\0', since common.ver has them. -- 1.7.3.4