From 34e0f7d1c3b77497efeda44ffc44d5995c5c3af3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 9 Jul 2008 20:54:20 +0000 Subject: [PATCH] 2008-07-09 22:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbcurl/hbcurl.c + Changed to use Harbour memory allocation functions in libcurl. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbcurl/hbcurl.c | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3047d3148f..872566ef0a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-09 22:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbcurl/hbcurl.c + + Changed to use Harbour memory allocation functions in + libcurl. + 2008-07-09 22:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_xmingwce.sh ! fixed HB_PPGEN_PATH setting diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index 38c9680f8a..737e3f84cc 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -111,11 +111,6 @@ typedef struct _HB_CURL /* ---------------------------------------------------------------------------- */ /* Global initialization/deinitialization */ -#ifdef _HB_CURL_REDEF_MEM - -/* NOTE/TOFIX: _HB_CURL_REDEF_MEM doesn't work at this moment, as hb_xgrab() is - getting pointers not allocated by our allocators. [vszakats] */ - void * hb_curl_xgrab( size_t size ) { return hb_xgrab( size ); @@ -146,20 +141,14 @@ void * hb_curl_calloc( size_t nelem, size_t elsize ) return ptr; } -#endif - HB_FUNC( CURL_GLOBAL_INIT ) { -#ifdef _HB_CURL_REDEF_MEM hb_retnl( ( long ) curl_global_init_mem( ISNUM( 1 ) ? hb_parnl( 1 ) : CURL_GLOBAL_ALL, hb_curl_xgrab, hb_curl_xfree, hb_curl_xrealloc, hb_curl_strdup, hb_curl_calloc ) ); -#else - hb_retnl( ( long ) curl_global_init( ISNUM( 1 ) ? hb_parnl( 1 ) : CURL_GLOBAL_ALL ) ); -#endif } HB_FUNC( CURL_GLOBAL_CLEANUP )