From a4935ea6047d5f5bb8647b13af887c86c239be7b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Jun 2010 01:21:46 +0000
Subject: [PATCH] 2010-06-22 03:20 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/ren_sfn.prg   * external/minizip/Makefile   *
 external/zlib/Makefile   * external/sqlite3/Makefile   -
 external/png/link.txt   * external/png/Makefile   * external/jpeg/Makefile  
 - external/jpeg/link.txt   - external/bzip2/ren_sfn.txt   *
 external/bzip2/Makefile   * external/libhpdf/Makefile   -
 external/libhpdf/ren_sfn.txt   - external/libhpdf/link.txt   -
 external/pcre/ren_sfn.txt   * external/pcre/Makefile     + Integrated
 ren_sfn.txt logic into Makefiles.     + Add link.txt content into Makefiles. 
    + Added links for all libs which didn't have one.

  * include/vm.api
    - Deleted ULONG casts.
---
 harbour/ChangeLog                    | 25 +++++++-
 harbour/config/ren_sfn.prg           |  7 ++-
 harbour/external/bzip2/Makefile      | 15 +++++
 harbour/external/bzip2/ren_sfn.txt   | 16 -----
 harbour/external/jpeg/Makefile       |  2 +
 harbour/external/jpeg/link.txt       |  5 --
 harbour/external/libhpdf/Makefile    | 87 ++++++++++++++++++++++++++++
 harbour/external/libhpdf/link.txt    |  9 ---
 harbour/external/libhpdf/ren_sfn.txt | 87 ----------------------------
 harbour/external/minizip/Makefile    |  2 +
 harbour/external/pcre/Makefile       | 31 ++++++++++
 harbour/external/pcre/ren_sfn.txt    | 32 ----------
 harbour/external/png/Makefile        |  2 +
 harbour/external/png/link.txt        |  5 --
 harbour/external/sqlite3/Makefile    |  2 +
 harbour/external/zlib/Makefile       |  2 +
 harbour/include/vm.api               | 16 ++---
 17 files changed, 180 insertions(+), 165 deletions(-)
 delete mode 100644 harbour/external/bzip2/ren_sfn.txt
 delete mode 100644 harbour/external/jpeg/link.txt
 delete mode 100644 harbour/external/libhpdf/link.txt
 delete mode 100644 harbour/external/libhpdf/ren_sfn.txt
 delete mode 100644 harbour/external/pcre/ren_sfn.txt
 delete mode 100644 harbour/external/png/link.txt

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 975783e2d1..8010e9b6a2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,29 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-22 03:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/ren_sfn.prg
+  * external/minizip/Makefile
+  * external/zlib/Makefile
+  * external/sqlite3/Makefile
+  - external/png/link.txt
+  * external/png/Makefile
+  * external/jpeg/Makefile
+  - external/jpeg/link.txt
+  - external/bzip2/ren_sfn.txt
+  * external/bzip2/Makefile
+  * external/libhpdf/Makefile
+  - external/libhpdf/ren_sfn.txt
+  - external/libhpdf/link.txt
+  - external/pcre/ren_sfn.txt
+  * external/pcre/Makefile
+    + Integrated ren_sfn.txt logic into Makefiles.
+    + Add link.txt content into Makefiles.
+    + Added links for all libs which didn't have one.
+
+  * include/vm.api
+    - Deleted ULONG casts.
+
 2010-06-22 02:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/compiler/harbour.y
   * harbour/src/compiler/harbour.yyc
@@ -52,7 +75,7 @@
       - Deleted unused hb_compExprMacroListLen().
     ; TOFIX: Use '$<lNumber>$' (or maybe newly added sNumber)
              instead of '$<iNumber>$' in .y code.
-             Przemek, what do you think?
+             Przemek, what do you think? [DONE]
 
   * src/compiler/Makefile
     * C files sorted.
diff --git a/harbour/config/ren_sfn.prg b/harbour/config/ren_sfn.prg
index 2043f19397..1aa5018c7c 100644
--- a/harbour/config/ren_sfn.prg
+++ b/harbour/config/ren_sfn.prg
@@ -20,9 +20,11 @@
 
 #pragma warninglevel=3
 
+#define _REN_PREFIX "# RENAME "
+
 PROCEDURE Main( cMode )
    LOCAL files := {}
-   LOCAL cFile := MemoRead( "ren_sfn.txt" )
+   LOCAL cFile := MemoRead( "Makefile" )
    LOCAL cLine
 
    IF ! Empty( cFile )
@@ -31,7 +33,8 @@ PROCEDURE Main( cMode )
       cFile := StrTran( cFile, Chr( 9 ), " " )
 
       FOR EACH cLine IN hb_ATokens( cFile, Chr( 10 ) )
-         IF ! Empty( cLine ) .AND. ! ( Left( AllTrim( cLine ), 1 ) == "#" )
+         IF ! Empty( cLine ) .AND. Left( AllTrim( cLine ), Len( _REN_PREFIX ) ) == _REN_PREFIX
+            cLine := SubStr( cLine, Len( _REN_PREFIX ) + 1 )
             IF Len( hb_ATokens( cLine ) ) == 2
                AAdd( files, hb_ATokens( cLine ) )
             ELSEIF Len( hb_ATokens( cLine ) ) == 1
diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile
index 15dc72e3c9..83bc2cbba8 100644
--- a/harbour/external/bzip2/Makefile
+++ b/harbour/external/bzip2/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := bz2
 
+# URL: http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
@@ -39,3 +41,16 @@ else
    HB_SKIP_REASON := unused
    include $(TOP)$(ROOT)config/none.mk
 endif
+
+# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
+# ------------------------------------------------
+# RENAME LICENSE    LICENSE
+# RENAME blocksor.c blocksort.c
+# RENAME bzlib.c    bzlib.c
+# RENAME compress.c compress.c
+# RENAME crctable.c crctable.c
+# RENAME decompre.c decompress.c
+# RENAME huffman.c  huffman.c
+# RENAME randtabl.c randtable.c
+# RENAME bzlib.h    bzlib.h
+# RENAME bzlib_pr.h bzlib_private.h
diff --git a/harbour/external/bzip2/ren_sfn.txt b/harbour/external/bzip2/ren_sfn.txt
deleted file mode 100644
index abdb835818..0000000000
--- a/harbour/external/bzip2/ren_sfn.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
-
-LICENSE    LICENSE
-blocksor.c blocksort.c
-bzlib.c    bzlib.c
-compress.c compress.c
-crctable.c crctable.c
-decompre.c decompress.c
-huffman.c  huffman.c
-randtabl.c randtable.c
-bzlib.h    bzlib.h
-bzlib_pr.h bzlib_private.h
diff --git a/harbour/external/jpeg/Makefile b/harbour/external/jpeg/Makefile
index 1c43e1d10f..a9bd874f38 100644
--- a/harbour/external/jpeg/Makefile
+++ b/harbour/external/jpeg/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := jpeg
 
+# URL: http://www.ijg.org/files/jpegsr8b.zip
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
diff --git a/harbour/external/jpeg/link.txt b/harbour/external/jpeg/link.txt
deleted file mode 100644
index 3d9b582d61..0000000000
--- a/harbour/external/jpeg/link.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * $Id$
- */
-
-http://www.ijg.org/files/jpegsr8b.zip
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index 03b82da364..a2f2ba1ad2 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -11,6 +11,9 @@ HB_BUILD_MODE := c
 
 LIBNAME := libhpdf
 
+# URL (stable): http://libharu.org/files/libharu-2.1.0.tar.gz
+# URL (unstable): git clone http://git.libharu.org/libharu.git
+
 C_SOURCES := \
    _hbhbpdf.c \
    hpdfanno.c \
@@ -136,3 +139,87 @@ else
    HB_SKIP_REASON := platform or compiler not supported
    include $(TOP)$(ROOT)config/none.mk
 endif
+
+# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
+#
+# RENAME README     README
+# RENAME hpdfanno.c hpdf_annotation.c
+# RENAME hpdfarra.c hpdf_array.c
+# RENAME hpdfbina.c hpdf_binary.c
+# RENAME hpdfbool.c hpdf_boolean.c
+# RENAME hpdfcata.c hpdf_catalog.c
+# RENAME hpdfdest.c hpdf_destination.c
+# RENAME hpdfdict.c hpdf_dict.c
+# RENAME hpdfdoc.c  hpdf_doc.c
+# RENAME hpdfdocp.c hpdf_doc_png.c
+# RENAME hpdfenco.c hpdf_encoder.c
+# RENAME hpdfencc.c hpdf_encoder_cns.c
+# RENAME hpdfencn.c hpdf_encoder_cnt.c
+# RENAME hpdfencj.c hpdf_encoder_jp.c
+# RENAME hpdfenck.c hpdf_encoder_kr.c
+# RENAME hpdfecy.c  hpdf_encrypt.c
+# RENAME hpdfecyd.c hpdf_encryptdict.c
+# RENAME hpdferro.c hpdf_error.c
+# RENAME hpdfextg.c hpdf_ext_gstate.c
+# RENAME hpdffont.c hpdf_font.c
+# RENAME hpdffonc.c hpdf_font_cid.c
+# RENAME hpdffott.c hpdf_font_tt.c
+# RENAME hpdffon1.c hpdf_font_type1.c
+# RENAME hpdffdf.c  hpdf_fontdef.c
+# RENAME hpdffdfb.c hpdf_fontdef_base14.c
+# RENAME hpdffdfi.c hpdf_fontdef_cid.c
+# RENAME hpdffdfc.c hpdf_fontdef_cns.c
+# RENAME hpdffdfn.c hpdf_fontdef_cnt.c
+# RENAME hpdffdfj.c hpdf_fontdef_jp.c
+# RENAME hpdffdfk.c hpdf_fontdef_kr.c
+# RENAME hpdffdft.c hpdf_fontdef_tt.c
+# RENAME hpdffdf1.c hpdf_fontdef_type1.c
+# RENAME hpdfgsta.c hpdf_gstate.c
+# RENAME hpdfimag.c hpdf_image.c
+# RENAME hpdfimap.c hpdf_image_png.c
+# RENAME hpdfinfo.c hpdf_info.c
+# RENAME hpdflist.c hpdf_list.c
+# RENAME hpdfmmgr.c hpdf_mmgr.c
+# RENAME hpdfname.c hpdf_name.c
+# RENAME hpdfnull.c hpdf_null.c
+# RENAME hpdfnumb.c hpdf_number.c
+# RENAME hpdfobje.c hpdf_objects.c
+# RENAME hpdfoutl.c hpdf_outline.c
+# RENAME hpdfpage.c hpdf_page_label.c
+# RENAME hpdfpago.c hpdf_page_operator.c
+# RENAME hpdfpags.c hpdf_pages.c
+# RENAME hpdfreal.c hpdf_real.c
+# RENAME hpdfstre.c hpdf_streams.c
+# RENAME hpdfstri.c hpdf_string.c
+# RENAME hpdfu3d.c  hpdf_u3d.c
+# RENAME hpdfutil.c hpdf_utils.c
+# RENAME hpdfxref.c hpdf_xref.c
+# RENAME hpdf.h     hpdf.h
+# RENAME hpdfanno.h hpdf_annotation.h
+# RENAME hpdfcata.h hpdf_catalog.h
+# RENAME hpdfconf.h hpdf_conf.h
+# RENAME hpdfcfg.h  hpdf_config.h
+# RENAME hpdfcons.h hpdf_consts.h
+# RENAME hpdfdest.h hpdf_destination.h
+# RENAME hpdfdoc.h  hpdf_doc.h
+# RENAME hpdfenco.h hpdf_encoder.h
+# RENAME hpdfencr.h hpdf_encrypt.h
+# RENAME hpdfency.h hpdf_encryptdict.h
+# RENAME hpdferro.h hpdf_error.h
+# RENAME hpdfextg.h hpdf_ext_gstate.h
+# RENAME hpdffont.h hpdf_font.h
+# RENAME hpdffond.h hpdf_fontdef.h
+# RENAME hpdfgsta.h hpdf_gstate.h
+# RENAME hpdfimag.h hpdf_image.h
+# RENAME hpdfinfo.h hpdf_info.h
+# RENAME hpdflist.h hpdf_list.h
+# RENAME hpdfmmgr.h hpdf_mmgr.h
+# RENAME hpdfobje.h hpdf_objects.h
+# RENAME hpdfoutl.h hpdf_outline.h
+# RENAME hpdfpage.h hpdf_page_label.h
+# RENAME hpdfpags.h hpdf_pages.h
+# RENAME hpdfstre.h hpdf_streams.h
+# RENAME hpdftype.h hpdf_types.h
+# RENAME hpdfu3d.h  hpdf_u3d.h
+# RENAME hpdfutil.h hpdf_utils.h
+# RENAME hpdfvers.h hpdf_version.h
diff --git a/harbour/external/libhpdf/link.txt b/harbour/external/libhpdf/link.txt
deleted file mode 100644
index 8dd3356017..0000000000
--- a/harbour/external/libhpdf/link.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id$
- */
-
-stable:
-http://libharu.org/files/libharu-2.1.0.tar.gz
-
-unstable:
-git clone http://git.libharu.org/libharu.git
diff --git a/harbour/external/libhpdf/ren_sfn.txt b/harbour/external/libhpdf/ren_sfn.txt
deleted file mode 100644
index 82cdf4429e..0000000000
--- a/harbour/external/libhpdf/ren_sfn.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# $Id$
-#
-
-# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
-
-README     README
-hpdfanno.c hpdf_annotation.c
-hpdfarra.c hpdf_array.c
-hpdfbina.c hpdf_binary.c
-hpdfbool.c hpdf_boolean.c
-hpdfcata.c hpdf_catalog.c
-hpdfdest.c hpdf_destination.c
-hpdfdict.c hpdf_dict.c
-hpdfdoc.c  hpdf_doc.c
-hpdfdocp.c hpdf_doc_png.c
-hpdfenco.c hpdf_encoder.c
-hpdfencc.c hpdf_encoder_cns.c
-hpdfencn.c hpdf_encoder_cnt.c
-hpdfencj.c hpdf_encoder_jp.c
-hpdfenck.c hpdf_encoder_kr.c
-hpdfecy.c  hpdf_encrypt.c
-hpdfecyd.c hpdf_encryptdict.c
-hpdferro.c hpdf_error.c
-hpdfextg.c hpdf_ext_gstate.c
-hpdffont.c hpdf_font.c
-hpdffonc.c hpdf_font_cid.c
-hpdffott.c hpdf_font_tt.c
-hpdffon1.c hpdf_font_type1.c
-hpdffdf.c  hpdf_fontdef.c
-hpdffdfb.c hpdf_fontdef_base14.c
-hpdffdfi.c hpdf_fontdef_cid.c
-hpdffdfc.c hpdf_fontdef_cns.c
-hpdffdfn.c hpdf_fontdef_cnt.c
-hpdffdfj.c hpdf_fontdef_jp.c
-hpdffdfk.c hpdf_fontdef_kr.c
-hpdffdft.c hpdf_fontdef_tt.c
-hpdffdf1.c hpdf_fontdef_type1.c
-hpdfgsta.c hpdf_gstate.c
-hpdfimag.c hpdf_image.c
-hpdfimap.c hpdf_image_png.c
-hpdfinfo.c hpdf_info.c
-hpdflist.c hpdf_list.c
-hpdfmmgr.c hpdf_mmgr.c
-hpdfname.c hpdf_name.c
-hpdfnull.c hpdf_null.c
-hpdfnumb.c hpdf_number.c
-hpdfobje.c hpdf_objects.c
-hpdfoutl.c hpdf_outline.c
-hpdfpage.c hpdf_page_label.c
-hpdfpago.c hpdf_page_operator.c
-hpdfpags.c hpdf_pages.c
-hpdfreal.c hpdf_real.c
-hpdfstre.c hpdf_streams.c
-hpdfstri.c hpdf_string.c
-hpdfu3d.c  hpdf_u3d.c
-hpdfutil.c hpdf_utils.c
-hpdfxref.c hpdf_xref.c
-hpdf.h     hpdf.h
-hpdfanno.h hpdf_annotation.h
-hpdfcata.h hpdf_catalog.h
-hpdfconf.h hpdf_conf.h
-hpdfcfg.h  hpdf_config.h
-hpdfcons.h hpdf_consts.h
-hpdfdest.h hpdf_destination.h
-hpdfdoc.h  hpdf_doc.h
-hpdfenco.h hpdf_encoder.h
-hpdfencr.h hpdf_encrypt.h
-hpdfency.h hpdf_encryptdict.h
-hpdferro.h hpdf_error.h
-hpdfextg.h hpdf_ext_gstate.h
-hpdffont.h hpdf_font.h
-hpdffond.h hpdf_fontdef.h
-hpdfgsta.h hpdf_gstate.h
-hpdfimag.h hpdf_image.h
-hpdfinfo.h hpdf_info.h
-hpdflist.h hpdf_list.h
-hpdfmmgr.h hpdf_mmgr.h
-hpdfobje.h hpdf_objects.h
-hpdfoutl.h hpdf_outline.h
-hpdfpage.h hpdf_page_label.h
-hpdfpags.h hpdf_pages.h
-hpdfstre.h hpdf_streams.h
-hpdftype.h hpdf_types.h
-hpdfu3d.h  hpdf_u3d.h
-hpdfutil.h hpdf_utils.h
-hpdfvers.h hpdf_version.h
diff --git a/harbour/external/minizip/Makefile b/harbour/external/minizip/Makefile
index 9ff4c5f045..1c1c1f151c 100644
--- a/harbour/external/minizip/Makefile
+++ b/harbour/external/minizip/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := minizip
 
+# URL: http://zlib.net/zlib125.zip
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile
index c831c2be41..93657bbddb 100644
--- a/harbour/external/pcre/Makefile
+++ b/harbour/external/pcre/Makefile
@@ -6,6 +6,8 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
+# URL: http://sourceforge.net/projects/pcre/files/pcre/8.02/pcre-8.02.zip/download
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
@@ -66,3 +68,32 @@ else
    HB_SKIP_REASON := unused
    include $(TOP)$(ROOT)config/none.mk
 endif
+
+# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
+#
+# RENAME LICENCE    LICENCE
+# RENAME config.h   config.h.generic
+# RENAME pcre.h     pcre.h.generic
+# RENAME pcreinal.h pcre_internal.h
+# RENAME ucp.h      ucp.h
+# RENAME chartabs.c pcre_chartables.c.dist
+# RENAME pcrecomp.c pcre_compile.c
+# RENAME pcreconf.c pcre_config.c
+# RENAME pcredfa.c  pcre_dfa_exec.c
+# RENAME pcreexec.c pcre_exec.c
+# RENAME pcrefinf.c pcre_fullinfo.c
+# RENAME pcreget.c  pcre_get.c
+# RENAME pcreglob.c pcre_globals.c
+# RENAME pcreinfo.c pcre_info.c
+# RENAME pcremktb.c pcre_maketables.c
+# RENAME pcrenewl.c pcre_newline.c
+# RENAME pcreoutf.c pcre_ord2utf8.c
+# RENAME pcreprni.h pcre_printint.src
+# RENAME pcrerefc.c pcre_refcount.c
+# RENAME pcrestud.c pcre_study.c
+# RENAME pcretabs.c pcre_tables.c
+# RENAME pcretryf.c pcre_try_flipped.c
+# RENAME pcreucd.c  pcre_ucd.c
+# RENAME pcrevutf.c pcre_valid_utf8.c
+# RENAME pcrever.c  pcre_version.c
+# RENAME pcrexcls.c pcre_xclass.c
diff --git a/harbour/external/pcre/ren_sfn.txt b/harbour/external/pcre/ren_sfn.txt
deleted file mode 100644
index 3d3cf15efa..0000000000
--- a/harbour/external/pcre/ren_sfn.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-
-# Use with 'hbrun <root>/config/ren_sfn.prg [F|T]'
-
-LICENCE    LICENCE
-config.h   config.h.generic
-pcre.h     pcre.h.generic
-pcreinal.h pcre_internal.h
-ucp.h      ucp.h
-chartabs.c pcre_chartables.c.dist
-pcrecomp.c pcre_compile.c
-pcreconf.c pcre_config.c
-pcredfa.c  pcre_dfa_exec.c
-pcreexec.c pcre_exec.c
-pcrefinf.c pcre_fullinfo.c
-pcreget.c  pcre_get.c
-pcreglob.c pcre_globals.c
-pcreinfo.c pcre_info.c
-pcremktb.c pcre_maketables.c
-pcrenewl.c pcre_newline.c
-pcreoutf.c pcre_ord2utf8.c
-pcreprni.h pcre_printint.src
-pcrerefc.c pcre_refcount.c
-pcrestud.c pcre_study.c
-pcretabs.c pcre_tables.c
-pcretryf.c pcre_try_flipped.c
-pcreucd.c  pcre_ucd.c
-pcrevutf.c pcre_valid_utf8.c
-pcrever.c  pcre_version.c
-pcrexcls.c pcre_xclass.c
diff --git a/harbour/external/png/Makefile b/harbour/external/png/Makefile
index 2accee7942..78fef4903c 100644
--- a/harbour/external/png/Makefile
+++ b/harbour/external/png/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := png
 
+# URL: http://sourceforge.net/projects/libpng/files/01-libpng-master/1.4.2/lpng142.zip/download
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
diff --git a/harbour/external/png/link.txt b/harbour/external/png/link.txt
deleted file mode 100644
index 32d2af776d..0000000000
--- a/harbour/external/png/link.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * $Id$
- */
-
-http://sourceforge.net/project/showfiles.php?group_id=5624&package_id=5683
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index 5a0e8b7dff..9cee593ff3 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := sqlite3
 
+# URL: http://www.sqlite.org/sqlite-amalgamation-3_6_23_1.zip
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile
index b1f3ad83bf..d28585ac16 100644
--- a/harbour/external/zlib/Makefile
+++ b/harbour/external/zlib/Makefile
@@ -8,6 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbzlib
 
+# URL: http://zlib.net/zlib125.zip
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
diff --git a/harbour/include/vm.api b/harbour/include/vm.api
index 2be8e464e5..c0089114ed 100644
--- a/harbour/include/vm.api
+++ b/harbour/include/vm.api
@@ -64,9 +64,9 @@
 #include "hbapi.h"
 
 /* Standard */
-#define _xvalloc( size, flags )      hb_xvalloc( ( ULONG ) size, flags )
+#define _xvalloc( size, flags )      hb_xvalloc( size, flags )
 #define _xvfree( h )                 hb_xvfree( h )
-#define _xvrealloc( h, size, flags ) hb_xvrealloc( h, ( ULONG ) size, flags )
+#define _xvrealloc( h, size, flags ) hb_xvrealloc( h, size, flags )
 #define _xvlock( h )                 hb_xvlock( h )
 #define _xvunlock( h )               hb_xvunlock( h )
 
@@ -79,12 +79,12 @@
 #define _xvsize( h )                 hb_xvsize( h )
 
 /* Heap */
-#define _xvheapnew( size )           hb_xvheapnew( ( ULONG ) size )
+#define _xvheapnew( size )           hb_xvheapnew( size )
 #define _xvheapdestroy( h )          hb_xvheapdestroy( h )
-#define _xvheapresize( h, size )     hb_xvheapresize( h, ( ULONG ) size )
-#define _xvheapalloc( h, size )      hb_xvheapalloc( h, ( ULONG ) size )
-#define _xvheapfree( h, offset )     hb_xvheapfree( h, ( ULONG ) offset )
-#define _xvheaplock( h, offset )     hb_xvheaplock( h, ( ULONG ) offset )
-#define _xvheapunlock( h, offset )   hb_xvheapunlock( h, ( ULONG ) offset )
+#define _xvheapresize( h, size )     hb_xvheapresize( h, size )
+#define _xvheapalloc( h, size )      hb_xvheapalloc( h, size )
+#define _xvheapfree( h, offset )     hb_xvheapfree( h, offset )
+#define _xvheaplock( h, offset )     hb_xvheaplock( h, offset )
+#define _xvheapunlock( h, offset )   hb_xvheapunlock( h, offset )
 
 #endif /* _VM_API */