From 0f9e81c6f3cc6f7541ea3edc2ccbbda651703c2f Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Sat, 10 Sep 2011 16:53:47 +0200 Subject: [PATCH] Use predefined resource compiler macro. --- include/libssh2.h | 4 ++-- win32/GNUmakefile | 2 +- win32/Makefile.Watcom | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libssh2.h b/include/libssh2.h index efb5ea13..f27382ea 100644 --- a/include/libssh2.h +++ b/include/libssh2.h @@ -82,7 +82,7 @@ */ #define LIBSSH2_TIMESTAMP "DEV" -#ifndef LIBSSH2_VERSION_ONLY +#ifndef RC_INVOKED #ifdef __cplusplus extern "C" { @@ -1166,6 +1166,6 @@ LIBSSH2_API int libssh2_trace_sethandler(LIBSSH2_SESSION *session, } /* extern "C" */ #endif -#endif /* LIBSSH2_VERSION_ONLY */ +#endif /* !RC_INVOKED */ #endif /* LIBSSH2_H */ diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 853a251e..5c2f5c97 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -120,7 +120,7 @@ LIBEXT = a RANLIB = $(CROSSPREFIX)ranlib #LDLIBS += -lwsock32 LDLIBS += -lws2_32 -RCFLAGS = -DLIBSSH2_VERSION_ONLY -I. -I ../include -O coff -i +RCFLAGS = -I. -I ../include -O coff -i CFLAGS += -fno-strict-aliasing CFLAGS += -Wall # -pedantic endif diff --git a/win32/Makefile.Watcom b/win32/Makefile.Watcom index 38f41b59..25ac5f1a 100644 --- a/win32/Makefile.Watcom +++ b/win32/Makefile.Watcom @@ -140,7 +140,7 @@ $(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG) .ERASE $(RESOURCE): libssh2.rc - $(RC) $(DEBUG) -q -r -zm -DLIBSSH2_VERSION_ONLY -I..\include $(SYS_INCL) $[@ -fo=$^@ + $(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@ .ERASE .c{$(OBJ_BASE)\dyn}.obj: