From 0e53a69d718ed8af26ded941c5bc57d42fff9083 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 27 Jun 2008 11:23:39 +0000 Subject: [PATCH] 2008-06-27 13:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbstdgen.ch * include/hbver.h * Cleanups to previous change. ! Fixed HB_STD_CH_ to not be #defined in .prgs by default. --- harbour/ChangeLog | 6 ++++++ harbour/include/hbstdgen.ch | 20 ++++++++++---------- harbour/include/hbver.h | 13 +++---------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dee9d47299..b969a0f338 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-27 13:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/hbstdgen.ch + * include/hbver.h + * Cleanups to previous change. + ! Fixed HB_STD_CH_ to not be #defined in .prgs by default. + 2008-06-27 12:51 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbgf/hbgfgtk/creamenu.c - Removed deprecated pre GTK2 API call with no equivalent diff --git a/harbour/include/hbstdgen.ch b/harbour/include/hbstdgen.ch index 4fe2d2d75f..b2860273a3 100644 --- a/harbour/include/hbstdgen.ch +++ b/harbour/include/hbstdgen.ch @@ -50,20 +50,20 @@ * */ -/* include hbsetup.ch to set default build settings */ -#include "hbsetup.ch" -/* include version macros */ -#ifndef _HB_PRG_LEVEL - #define _HB_PRG_LEVEL -#endif -#include "hbver.h" -#undef _HB_PRG_LEVEL -/* include std.ch to set default rules */ -#include "std.ch" +#include "hbver.h" /* include version macros (__HARBOUR__) */ +#include "hbsetup.ch" /* include hbsetup.ch to set default build settings */ +#include "std.ch" /* include to set default rules */ /* undefine all rules which are not necessary in default PP tables */ #undef HB_VER_H_ #undef HB_SETUP_CH_ +#undef HB_STD_CH_ + +#undef HB_VER_MAJOR +#undef HB_VER_MINOR +#undef HB_VER_REVISION +#undef HB_VER_STATUS +#undef HB_VERSION #undef __DATE__ #undef __TIME__ diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 7116553819..f8fc55c1d5 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -53,7 +53,9 @@ #ifndef HB_VER_H_ #define HB_VER_H_ -#ifndef _HB_PRG_LEVEL +#if defined(__HARBOUR__) + #undef __HARBOUR__ +#endif /* NOTE: One of these next three fields can be incremented by the hbverfix program */ @@ -62,15 +64,6 @@ #define HB_VER_REVISION 0 /* Revision number */ #define HB_VER_STATUS "RC1" /* Build status */ #define HB_VERSION 0x010000 /* Three bytes: Major + Minor + Revision */ - -#endif - -/* #include "hb_verbld.h" */ - -#if defined(__HARBOUR__) - #undef __HARBOUR__ -#endif - #define __HARBOUR__ 0x0100 /* Two bytes: Major + Minor. This is recommented for 3rd party .c and .prg level code. */ #endif /* HB_VER_H_ */