From 0420946df110089dcdb092a91c55c77d469bb075 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 25 Jun 2010 00:33:18 +0000 Subject: [PATCH] 2010-06-25 02:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/minizip/Makefile * external/zlib/Makefile * external/sqlite3/Makefile * external/png/Makefile * external/jpeg/Makefile * external/bzip2/Makefile * external/libhpdf/Makefile * external/pcre/Makefile + Applied patch by Tamas Tevesz, adding metadata for patchup tool. (also completing pending TODO) * external/patchup.prg + Enabled -w3 option via pragma ! Fixed one -w3 warnings ! Fixed to not stop due to missing .dif file in -rediff mode. ! Applied fix patch by Tamas Tevesz. * src/rtl/inkeyapi.c * Formatting. --- harbour/ChangeLog | 23 +++- harbour/external/bzip2/Makefile | 27 ++--- harbour/external/jpeg/Makefile | 83 ++++++++++++++- harbour/external/libhpdf/Makefile | 170 +++++++++++++++--------------- harbour/external/minizip/Makefile | 15 ++- harbour/external/patchup.prg | 12 ++- harbour/external/pcre/Makefile | 59 ++++++----- harbour/external/png/Makefile | 27 ++++- harbour/external/sqlite3/Makefile | 10 +- harbour/external/zlib/Makefile | 35 +++++- harbour/src/rtl/inkeyapi.c | 6 +- 11 files changed, 323 insertions(+), 144 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 00dfe14e58..60412297d6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-25 02:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/minizip/Makefile + * external/zlib/Makefile + * external/sqlite3/Makefile + * external/png/Makefile + * external/jpeg/Makefile + * external/bzip2/Makefile + * external/libhpdf/Makefile + * external/pcre/Makefile + + Applied patch by Tamas Tevesz, adding metadata for patchup tool. + (also completing pending TODO) + + * external/patchup.prg + + Enabled -w3 option via pragma + ! Fixed one -w3 warnings + ! Fixed to not stop due to missing .dif file in -rediff mode. + ! Applied fix patch by Tamas Tevesz. + + * src/rtl/inkeyapi.c + * Formatting. + 2010-06-25 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + external/patchup.prg + Added new 'patchup' Harbour script written by Tamas Tevesz. @@ -31,7 +52,7 @@ Very nice job, thanks a lot Tamas. - ; TODO: Updating Makefiles with new metadata. + ; TODO: Updating Makefiles with new metadata. [DONE] - config/ren_sfn.prg - Deleted tool now superceded by patchup.prg diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile index 83bc2cbba8..3e25b4558e 100644 --- a/harbour/external/bzip2/Makefile +++ b/harbour/external/bzip2/Makefile @@ -42,15 +42,18 @@ else include $(TOP)$(ROOT)config/none.mk endif -# Use with 'hbrun /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 +# ORIGIN http://www.bzip.org/ +# VER 1.0.5 +# URL http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz +# DIFF +# +# MAP LICENSE +# MAP blocksort.c blocksor.c +# MAP bzlib.c +# MAP bzlib.h +# MAP bzlib_private.h bzlib_pr.h +# MAP compress.c +# MAP crctable.c +# MAP decompress.c decompre.c +# MAP huffman.c +# MAP randtable.c randtabl.c diff --git a/harbour/external/jpeg/Makefile b/harbour/external/jpeg/Makefile index a9bd874f38..2ba91afa18 100644 --- a/harbour/external/jpeg/Makefile +++ b/harbour/external/jpeg/Makefile @@ -8,8 +8,6 @@ include $(TOP)$(ROOT)config/global.mk LIBNAME := jpeg -# URL: http://www.ijg.org/files/jpegsr8b.zip - HB_BUILD_WARN := no HB_BUILD_MODE := c @@ -105,3 +103,84 @@ else HB_SKIP_REASON := compiler not supported include $(TOP)$(ROOT)config/none.mk endif + +# ORIGIN http://www.ijg.org/ +# VER 8b +# URL http://www.ijg.org/files/jpegsr8b.zip +# DIFF +# +# MAP README +# MAP cderror.h +# MAP cdjpeg.h +# MAP jaricom.c +# MAP jcapimin.c +# MAP jcapistd.c +# MAP jcarith.c +# MAP jccoefct.c +# MAP jccolor.c +# MAP jcdctmgr.c +# MAP jchuff.c +# MAP jcinit.c +# MAP jcmainct.c +# MAP jcmarker.c +# MAP jcmaster.c +# MAP jcomapi.c +# MAP jcparam.c +# MAP jcprepct.c +# MAP jcsample.c +# MAP jctrans.c +# MAP jdapimin.c +# MAP jdapistd.c +# MAP jdarith.c +# MAP jdatadst.c +# MAP jdatasrc.c +# MAP jdcoefct.c +# MAP jdcolor.c +# MAP jdct.h +# MAP jddctmgr.c +# MAP jdhuff.c +# MAP jdinput.c +# MAP jdmainct.c +# MAP jdmarker.c +# MAP jdmaster.c +# MAP jdmerge.c +# MAP jdpostct.c +# MAP jdsample.c +# MAP jdtrans.c +# MAP jerror.c +# MAP jerror.h +# MAP jfdctflt.c +# MAP jfdctfst.c +# MAP jfdctint.c +# MAP jidctflt.c +# MAP jidctfst.c +# MAP jidctint.c +# MAP jinclude.h +# MAP jmemansi.c +# MAP jmemdos.c +# MAP jmemmac.c +# MAP jmemmgr.c +# MAP jmemname.c +# MAP jmemnobs.c +# MAP jmemsys.h +# MAP jmorecfg.h +# MAP jpegint.h +# MAP jpeglib.h +# MAP jquant1.c +# MAP jquant2.c +# MAP jutils.c +# MAP jversion.h +# MAP rdbmp.c +# MAP rdcolmap.c +# MAP rdgif.c +# MAP rdppm.c +# MAP rdrle.c +# MAP rdswitch.c +# MAP rdtarga.c +# MAP transupp.c +# MAP transupp.h +# MAP wrbmp.c +# MAP wrgif.c +# MAP wrppm.c +# MAP wrrle.c +# MAP wrtarga.c diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index a2f2ba1ad2..d9e76d75fa 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -11,9 +11,6 @@ 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 \ @@ -140,86 +137,89 @@ else include $(TOP)$(ROOT)config/none.mk endif -# Use with 'hbrun /config/ren_sfn.prg [F|T]' +# ORIGIN http://libharu.org/ +# VER 2.1.0 +# URL http://libharu.org/files/libharu-2.1.0.tar.gz +# DIFF libhpdf.dif # -# 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 +# MAP README +# MAP hpdf_annotation.c hpdfanno.c +# MAP hpdf_array.c hpdfarra.c +# MAP hpdf_binary.c hpdfbina.c +# MAP hpdf_boolean.c hpdfbool.c +# MAP hpdf_catalog.c hpdfcata.c +# MAP hpdf_destination.c hpdfdest.c +# MAP hpdf_dict.c hpdfdict.c +# MAP hpdf_doc.c hpdfdoc.c +# MAP hpdf_doc_png.c hpdfdocp.c +# MAP hpdf_encoder.c hpdfenco.c +# MAP hpdf_encoder_cns.c hpdfencc.c +# MAP hpdf_encoder_cnt.c hpdfencn.c +# MAP hpdf_encoder_jp.c hpdfencj.c +# MAP hpdf_encoder_kr.c hpdfenck.c +# MAP hpdf_encrypt.c hpdfecy.c +# MAP hpdf_encryptdict.c hpdfecyd.c +# MAP hpdf_error.c hpdferro.c +# MAP hpdf_ext_gstate.c hpdfextg.c +# MAP hpdf_font.c hpdffont.c +# MAP hpdf_font_cid.c hpdffonc.c +# MAP hpdf_font_tt.c hpdffott.c +# MAP hpdf_font_type1.c hpdffon1.c +# MAP hpdf_fontdef.c hpdffdf.c +# MAP hpdf_fontdef_base14.c hpdffdfb.c +# MAP hpdf_fontdef_cid.c hpdffdfi.c +# MAP hpdf_fontdef_cns.c hpdffdfc.c +# MAP hpdf_fontdef_cnt.c hpdffdfn.c +# MAP hpdf_fontdef_jp.c hpdffdfj.c +# MAP hpdf_fontdef_kr.c hpdffdfk.c +# MAP hpdf_fontdef_tt.c hpdffdft.c +# MAP hpdf_fontdef_type1.c hpdffdf1.c +# MAP hpdf_gstate.c hpdfgsta.c +# MAP hpdf_image.c hpdfimag.c +# MAP hpdf_image_png.c hpdfimap.c +# MAP hpdf_info.c hpdfinfo.c +# MAP hpdf_list.c hpdflist.c +# MAP hpdf_mmgr.c hpdfmmgr.c +# MAP hpdf_name.c hpdfname.c +# MAP hpdf_null.c hpdfnull.c +# MAP hpdf_number.c hpdfnumb.c +# MAP hpdf_objects.c hpdfobje.c +# MAP hpdf_outline.c hpdfoutl.c +# MAP hpdf_page_label.c hpdfpage.c +# MAP hpdf_page_operator.c hpdfpago.c +# MAP hpdf_pages.c hpdfpags.c +# MAP hpdf_real.c hpdfreal.c +# MAP hpdf_streams.c hpdfstre.c +# MAP hpdf_string.c hpdfstri.c +# MAP hpdf_u3d.c hpdfu3d.c +# MAP hpdf_utils.c hpdfutil.c +# MAP hpdf_xref.c hpdfxref.c +# MAP hpdf.h +# MAP hpdf_annotation.h hpdfanno.h +# MAP hpdf_catalog.h hpdfcata.h +# MAP hpdf_conf.h hpdfconf.h +# MAP hpdf_config.h hpdfcfg.h +# MAP hpdf_consts.h hpdfcons.h +# MAP hpdf_destination.h hpdfdest.h +# MAP hpdf_doc.h hpdfdoc.h +# MAP hpdf_encoder.h hpdfenco.h +# MAP hpdf_encrypt.h hpdfencr.h +# MAP hpdf_encryptdict.h hpdfency.h +# MAP hpdf_error.h hpdferro.h +# MAP hpdf_ext_gstate.h hpdfextg.h +# MAP hpdf_font.h hpdffont.h +# MAP hpdf_fontdef.h hpdffond.h +# MAP hpdf_gstate.h hpdfgsta.h +# MAP hpdf_image.h hpdfimag.h +# MAP hpdf_info.h hpdfinfo.h +# MAP hpdf_list.h hpdflist.h +# MAP hpdf_mmgr.h hpdfmmgr.h +# MAP hpdf_objects.h hpdfobje.h +# MAP hpdf_outline.h hpdfoutl.h +# MAP hpdf_page_label.h hpdfpage.h +# MAP hpdf_pages.h hpdfpags.h +# MAP hpdf_streams.h hpdfstre.h +# MAP hpdf_types.h hpdftype.h +# MAP hpdf_u3d.h hpdfu3d.h +# MAP hpdf_utils.h hpdfutil.h +# MAP hpdf_version.h hpdfvers.h diff --git a/harbour/external/minizip/Makefile b/harbour/external/minizip/Makefile index 1c1c1f151c..21849788eb 100644 --- a/harbour/external/minizip/Makefile +++ b/harbour/external/minizip/Makefile @@ -8,8 +8,6 @@ include $(TOP)$(ROOT)config/global.mk LIBNAME := minizip -# URL: http://zlib.net/zlib125.zip - HB_BUILD_WARN := no HB_BUILD_MODE := c @@ -26,3 +24,16 @@ else HB_SKIP_REASON := component not found include $(TOP)$(ROOT)config/none.mk endif + +# ORIGIN http://www.winimage.com/zLibDll/minizip.html +# VER 1.1 +# URL http://www.winimage.com/zLibDll/unzip11.zip +# DIFF minizip.dif +# +# MAP crypt.h +# MAP ioapi.c +# MAP ioapi.h +# MAP unzip.c +# MAP unzip.h +# MAP zip.c +# MAP zip.h diff --git a/harbour/external/patchup.prg b/harbour/external/patchup.prg index b07c63f0dc..8e6bd65f54 100644 --- a/harbour/external/patchup.prg +++ b/harbour/external/patchup.prg @@ -186,6 +186,8 @@ * */ +#pragma warninglevel=3 + #if 0 #include "directry.ch" #else @@ -283,7 +285,8 @@ PROCEDURE Main( ... ) IF ! Empty( aRegexMatch := hb_regex( hRegexTake1Line, cMemoLine ) ) /* Process one-arg keywords */ IF aRegexMatch[ ONEARG_KW ] == "DIFF" - cDiffFile := AllTrim( aRegexMatch[ ONEARG_ARG ] ) + cDiffFile := iif( Empty( AllTrim( aRegexMatch[ ONEARG_ARG ] ) ), NIL, ; + AllTrim( aRegexMatch[ ONEARG_ARG ] ) ) ELSEIF aRegexMatch[ ONEARG_KW ] == "URL" cArchiveURL := AllTrim( aRegexMatch[ ONEARG_ARG ] ) ENDIF @@ -339,7 +342,7 @@ PROCEDURE Main( ... ) QUIT ENDIF - IF cDiffFile != NIL .AND. ! hb_FileExists( cDiffFile ) + IF ! lRediff .AND. cDiffFile != NIL .AND. ! hb_FileExists( cDiffFile ) OutStd( "E: `" + cDiffFile + "' does not exist" + OSNL ) ErrorLevel( 2 ) QUIT @@ -427,7 +430,7 @@ PROCEDURE Main( ... ) DirChange( s_cTempDir ) TRACE( "Running " + cCommand ) - nRunResult := hb_processRun( cCommand, , @cDiffText, @cStdErr, .F. ) + hb_processRun( cCommand, , @cDiffText, @cStdErr, .F. ) DirChange( cCWD ) SaveLog( "diff", NIL, cStdErr ) @@ -540,7 +543,8 @@ STATIC FUNCTION WalkAndFind( cTop, cLookFor ) cRetVal := cTop EXIT ENDIF - ELSEIF !( aDirEntry[ F_NAME ] == "." ) .AND. !( aDirEntry[ F_NAME ] == ".." ) + ELSEIF !( aDirEntry[ F_NAME ] == "." ) .AND. ; + !( aDirEntry[ F_NAME ] == ".." ) cRetVal := WalkAndFind( cTop + aDirEntry[ F_NAME ], cLookFor ) IF ! Empty( cRetVal ) EXIT diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile index 93657bbddb..08c58c7476 100644 --- a/harbour/external/pcre/Makefile +++ b/harbour/external/pcre/Makefile @@ -6,8 +6,6 @@ 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 @@ -69,31 +67,34 @@ else include $(TOP)$(ROOT)config/none.mk endif -# Use with 'hbrun /config/ren_sfn.prg [F|T]' +# ORIGIN http://www.pcre.org/ +# VER 8.02 +# URL http://sourceforge.net/projects/pcre/files/pcre/8.02/pcre-8.02.zip/download +# DIFF pcre.dif # -# 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 +# MAP LICENCE +# MAP config.h.generic config.h +# MAP pcre.h.generic pcre.h +# MAP pcre_internal.h pcreinal.h +# MAP ucp.h +# MAP pcre_chartables.c.dist chartabs.c +# MAP pcre_compile.c pcrecomp.c +# MAP pcre_config.c pcreconf.c +# MAP pcre_dfa_exec.c pcredfa.c +# MAP pcre_exec.c pcreexec.c +# MAP pcre_fullinfo.c pcrefinf.c +# MAP pcre_get.c pcreget.c +# MAP pcre_globals.c pcreglob.c +# MAP pcre_info.c pcreinfo.c +# MAP pcre_maketables.c pcremktb.c +# MAP pcre_newline.c pcrenewl.c +# MAP pcre_ord2utf8.c pcreoutf.c +# MAP pcre_printint.src pcreprni.h +# MAP pcre_refcount.c pcrerefc.c +# MAP pcre_study.c pcrestud.c +# MAP pcre_tables.c pcretabs.c +# MAP pcre_try_flipped.c pcretryf.c +# MAP pcre_ucd.c pcreucd.c +# MAP pcre_valid_utf8.c pcrevutf.c +# MAP pcre_version.c pcrever.c +# MAP pcre_xclass.c pcrexcls.c diff --git a/harbour/external/png/Makefile b/harbour/external/png/Makefile index 78fef4903c..bc39f92f15 100644 --- a/harbour/external/png/Makefile +++ b/harbour/external/png/Makefile @@ -8,8 +8,6 @@ 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 @@ -69,3 +67,28 @@ else HB_SKIP_REASON := compiler not supported include $(TOP)$(ROOT)config/none.mk endif + +# ORIGIN http://www.libpng.org/pub/png/libpng.html +# VER 1.4.2 +# URL http://sourceforge.net/projects/libpng/files/01-libpng-master/1.4.2/lpng142.zip/download +# DIFF +# +# MAP LICENCE +# MAP png.c +# MAP pngconf.h +# MAP pngerror.c +# MAP pngget.c +# MAP png.h +# MAP pngmem.c +# MAP pngpread.c +# MAP pngpriv.h +# MAP pngread.c +# MAP pngrio.c +# MAP pngrtran.c +# MAP pngrutil.c +# MAP pngset.c +# MAP pngtrans.c +# MAP pngwio.c +# MAP pngwrite.c +# MAP pngwtran.c +# MAP pngwutil.c diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index 9cee593ff3..bdd28290e2 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -8,8 +8,6 @@ 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 @@ -75,3 +73,11 @@ else HB_SKIP_REASON := platform or compiler not supported include $(TOP)$(ROOT)config/none.mk endif + +# ORIGIN http://www.sqlite.org/ +# VER 3.6.23.1 +# URL http://www.sqlite.org/sqlite-amalgamation-3_6_23_1.zip +# DIFF sqlite3.dif +# +# MAP sqlite3.c +# MAP sqlite3.h diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile index d28585ac16..4d839ea036 100644 --- a/harbour/external/zlib/Makefile +++ b/harbour/external/zlib/Makefile @@ -8,8 +8,6 @@ include $(TOP)$(ROOT)config/global.mk LIBNAME := hbzlib -# URL: http://zlib.net/zlib125.zip - HB_BUILD_WARN := no HB_BUILD_MODE := c @@ -45,3 +43,36 @@ else HB_SKIP_REASON := unused include $(TOP)$(ROOT)config/none.mk endif + +# ORIGIN http://www.zlib.net/ +# VER 1.2.5 +# URL http://zlib.net/zlib125.zip +# DIFF zlib.dif +# +# MAP README +# MAP adler32.c +# MAP compress.c +# MAP crc32.c +# MAP crc32.h +# MAP deflate.c +# MAP deflate.h +# MAP gzclose.c +# MAP gzguts.h +# MAP gzlib.c +# MAP gzread.c +# MAP gzwrite.c +# MAP infback.c +# MAP inffast.c +# MAP inffast.h +# MAP inffixed.h +# MAP inflate.c +# MAP inflate.h +# MAP inftrees.c +# MAP inftrees.h +# MAP trees.c +# MAP trees.h +# MAP uncompr.c +# MAP zconf.h +# MAP zlib.h +# MAP zutil.c +# MAP zutil.h diff --git a/harbour/src/rtl/inkeyapi.c b/harbour/src/rtl/inkeyapi.c index d821f21897..505866556b 100644 --- a/harbour/src/rtl/inkeyapi.c +++ b/harbour/src/rtl/inkeyapi.c @@ -96,7 +96,7 @@ void hb_inkeyIns( int iKey ) } } -int hb_inkeyLast( int iEventMask ) +int hb_inkeyLast( int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -112,7 +112,7 @@ int hb_inkeyLast( int iEventMask ) return iKey; } -int hb_inkeyNext( int iEventMask ) +int hb_inkeyNext( int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -132,7 +132,7 @@ void hb_inkeyPoll( void ) { PHB_GT pGT; - HB_TRACE( HB_TR_DEBUG, ("hb_inkeyPoll()") ); + HB_TRACE(HB_TR_DEBUG, ("hb_inkeyPoll()")); pGT = hb_gt_Base(); if( pGT )