diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2b9fda46c2..cfbbdbe582 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-11 08:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbdefs.h + + Added hbTRUE, hbFALSE. + + * config/win/bcc.cf + ! Fixed to use NT branch. Deleted Win9x method. + + * config/win/install.cf + * Minor. + 2009-07-11 07:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * tests/mathtest.prg * tests/testcgi.prg diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 72bf535ad8..e785c15a46 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -91,28 +91,8 @@ LDFLAGS = $(LINKPATHS) # create library rules AR = tlib.exe ARFLAGS = /P64 $(HB_USER_AFLAGS) -ifneq ($(SHLVL),) # shell AROBJS = $(foreach file, $(^F), -+$(file)) AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS) -else - -#Note: The empty line below HAVE TO exist! -define lib_object -@echo -+$(subst /,\,$(file)) ^& >> __lib__.tmp - -endef - -define create_library -@if exist __lib__.tmp del __lib__.tmp -$(foreach file, $(^F), $(lib_object)) -@echo -+>> __lib__.tmp -$(AR) $(subst /,\,$(LIB_DIR)/$@) $(ARFLAGS) @__lib__.tmp -endef - -AR_RULE = $(create_library) - -endif - include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/install.cf b/harbour/config/win/install.cf index 3663b6ee03..ded92c0a6a 100644 --- a/harbour/config/win/install.cf +++ b/harbour/config/win/install.cf @@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done else -ifeq ($(SHLVL),) # NT shell +ifeq ($(SHLVL),) # NT Shell INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS)) diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index f835a569f1..52c4664f2a 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -689,6 +689,10 @@ typedef unsigned long HB_COUNTER; /* TODO: Remove dependence on old types */ /* Harbour overloaded types: */ + +#define hbFALSE 0 +#define hbTRUE (!0) + typedef int hbBool; typedef char hbChar; /* TOFIX */ typedef signed char hbSChar;