diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4a85a8750a..d33e7278e8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-23 17:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapiitm.h + * harbour/source/vm/itemapi.c + * declared return value of hb_itemTypeStr() as const + + * harbour/harbour.spec + * removed hbsqlite3 from default builds - it has to be optional due + to external dependencies in current version + 2009-04-23 14:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/hvm.c % optimized memory allocation in cloned symbol tables to store diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 8ddd646011..9d2fca94b8 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -81,7 +81,7 @@ %define hb_idir export HB_INC_INSTALL=%{_includedir}/%{name} %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbhpdf hbvpdf hbziparc xhb rddsql %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_libharu:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_fbsql:hbfbird} %{?_with_allegro:gtalleg}" +%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbtip hbtpathy hbhpdf hbvpdf hbziparc xhb rddsql %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_libharu:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_fbsql:hbfbird} %{?_with_allegro:gtalleg}" %define hb_extrn export HB_EXTERNALLIBS=no %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_extrn} ; %{hb_cmrc} %define hb_host www.harbour-project.org @@ -667,7 +667,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbclipsm.a %{_libdir}/%{name}/librddsql.a %{_libdir}/%{name}/libhbmsql.a -%{_libdir}/%{name}/libhbsqlit3.a %{_libdir}/%{name}/libhbtpathy.a %{_libdir}/%{name}/libhbziparc.a diff --git a/harbour/include/hbapiitm.h b/harbour/include/hbapiitm.h index 2a433f2a5e..8e6085e71b 100644 --- a/harbour/include/hbapiitm.h +++ b/harbour/include/hbapiitm.h @@ -141,7 +141,7 @@ extern HB_EXPORT PHB_ITEM hb_itemReturnForward( PHB_ITEM pItem ); extern HB_EXPORT void hb_itemReturnRelease( PHB_ITEM pItem ); extern HB_EXPORT ULONG hb_itemSize ( PHB_ITEM pItem ); extern HB_EXPORT HB_TYPE hb_itemType ( PHB_ITEM pItem ); -extern HB_EXPORT char * hb_itemTypeStr ( PHB_ITEM pItem ); +extern HB_EXPORT const char * hb_itemTypeStr ( PHB_ITEM pItem ); #ifndef HB_LONG_LONG_OFF extern HB_EXPORT LONGLONG hb_itemGetNLL ( PHB_ITEM pItem ); extern HB_EXPORT PHB_ITEM hb_itemPutNLL ( PHB_ITEM pItem, LONGLONG lNumber ); diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 615ff6057c..b615ebdc0e 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -1426,49 +1426,49 @@ HB_TYPE hb_itemType( PHB_ITEM pItem ) return HB_IT_NIL; } -char * hb_itemTypeStr( PHB_ITEM pItem ) +const char * hb_itemTypeStr( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemTypeStr(%p)", pItem)); switch( HB_ITEM_TYPE( pItem ) ) { case HB_IT_ARRAY: - return ( char * ) ( hb_arrayIsObject( pItem ) ? "O" : "A" ); + return hb_arrayIsObject( pItem ) ? "O" : "A"; case HB_IT_BLOCK: - return ( char * ) "B"; + return "B"; case HB_IT_DATE: - return ( char * ) "D"; + return "D"; case HB_IT_TIMESTAMP: - return ( char * ) "T"; + return "T"; case HB_IT_LOGICAL: - return ( char * ) "L"; + return "L"; case HB_IT_INTEGER: case HB_IT_LONG: case HB_IT_DOUBLE: - return ( char * ) "N"; + return "N"; case HB_IT_STRING: - return ( char * ) "C"; + return "C"; case HB_IT_MEMO: - return ( char * ) "M"; + return "M"; case HB_IT_HASH: - return ( char * ) "H"; + return "H"; case HB_IT_POINTER: - return ( char * ) "P"; + return "P"; case HB_IT_SYMBOL: - return ( char * ) "S"; + return "S"; } - return ( char * ) "U"; + return "U"; } /* Internal API, not standard Clipper */