paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 19:29:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r43362 from trunk:

Browse Source 
------------------------------------------------------------------------
    r43362 | michael | 2019-11-02 15:33:19 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Forgot to commit
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43737 -
This commit is contained in:
michael 2019-12-23 13:34:17 +00:00
parent 13a835b99f
commit 29550e5633
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/libxml/src/globals.inc
View File

@ -155,12 +155,39 @@ var
{$ENDIF} {$ENDIF}
{$ELSE} (* !LIBXML_THREAD_ALLOC_ENABLED *) {$ELSE} (* !LIBXML_THREAD_ALLOC_ENABLED *)
{$IFDEF NO_EXTERNAL_VARS}
var var
xmlMalloc: xmlMallocFunc; {$IFNDEF NO_EXTERNAL_VARS}cvar; external;{$ENDIF} varxmlMalloc: PxmlMallocFunc;
xmlMallocAtomic: xmlMallocFunc; {$IFNDEF NO_EXTERNAL_VARS}cvar; external;{$ENDIF} varxmlMallocAtomic: PxmlMallocFunc;
xmlRealloc: xmlReallocFunc; {$IFNDEF NO_EXTERNAL_VARS}cvar; external;{$ENDIF} varxmlRealloc: PxmlReallocFunc;
xmlFree: xmlFreeFunc; {$IFNDEF NO_EXTERNAL_VARS}cvar; external;{$ENDIF} varxmlFree: PxmlFreeFunc;
xmlMemStrdup: xmlStrdupFunc; {$IFNDEF NO_EXTERNAL_VARS}cvar; external;{$ENDIF} varxmlMemStrdup: PxmlStrdupFunc;
function GetxmlMalloc: xmlMallocFunc; inline;
procedure SetxmlMalloc(AValue: xmlMallocFunc); inline;
function GetxmlMallocAtomic: xmlMallocFunc; inline;
procedure SetxmlMallocAtomic(AValue: xmlMallocFunc); inline;
function GetxmlRealloc: xmlReallocFunc; inline;
procedure SetxmlRealloc(AValue: xmlReallocFunc); inline;
function GetxmlFree: xmlFreeFunc; inline;
procedure SetxmlFree(AValue: xmlFreeFunc); inline;
function GetxmlMemStrdup: xmlStrdupFunc; inline;
procedure SetxmlMemStrdup(AValue: xmlStrdupFunc); inline;
property xmlMalloc: xmlMallocFunc read GetxmlMalloc write SetxmlMalloc;
property xmlMallocAtomic: xmlMallocFunc read GetxmlMallocAtomic write SetxmlMallocAtomic;
property xmlRealloc: xmlReallocFunc read GetxmlRealloc write SetxmlRealloc;
property xmlFree: xmlFreeFunc read GetxmlFree write SetxmlFree;
property xmlMemStrdup: xmlStrdupFunc read GetxmlMemStrdup write SetxmlMemStrdup;
{$ELSE}
var
xmlMalloc: xmlMallocFunc; cvar; external;
xmlMallocAtomic: xmlMallocFunc; cvar; external;
xmlRealloc: xmlReallocFunc; cvar; external;
xmlFree: xmlFreeFunc; cvar; external;
xmlMemStrdup: xmlStrdupFunc; cvar; external;
{$ENDIF}
{$ENDIF} (* LIBXML_THREAD_ALLOC_ENABLED *) {$ENDIF} (* LIBXML_THREAD_ALLOC_ENABLED *)
{$IFDEF LIBXML_DOCB_ENABLED} {$IFDEF LIBXML_DOCB_ENABLED}

14
packages/libxml/src/xmlmemory.inc
View File

@ -45,6 +45,9 @@
* Signature for a free() implementation. * Signature for a free() implementation.
*) *)
xmlFreeFunc = procedure(mem: pointer); EXTDECL; xmlFreeFunc = procedure(mem: pointer); EXTDECL;
{$IFDEF NO_EXTERNAL_VARS}
PxmlFreeFunc = ^xmlFreeFunc;
{$ENDIF}
(** (**
* xmlMallocFunc: * xmlMallocFunc:
@ -55,6 +58,9 @@
* Returns a pointer to the newly allocated block or NULL in case of error. * Returns a pointer to the newly allocated block or NULL in case of error.
*) *)
xmlMallocFunc = function(size: csize_t): pointer; EXTDECL; xmlMallocFunc = function(size: csize_t): pointer; EXTDECL;
{$IFDEF NO_EXTERNAL_VARS}
PxmlMallocFunc = ^xmlMallocFunc;
{$ENDIF}
(** (**
* xmlReallocFunc: * xmlReallocFunc:
@ -66,6 +72,9 @@
* Returns a pointer to the newly reallocated block or NULL in case of error. * Returns a pointer to the newly reallocated block or NULL in case of error.
*) *)
xmlReallocFunc = function(mem: pointer; size: csize_t): pointer; EXTDECL; xmlReallocFunc = function(mem: pointer; size: csize_t): pointer; EXTDECL;
{$IFDEF NO_EXTERNAL_VARS}
PxmlReallocFunc = ^xmlReallocFunc;
{$ENDIF}
(** (**
* xmlStrdupFunc: * xmlStrdupFunc:
@ -76,6 +85,9 @@
* Returns the copy of the string or NULL in case of error. * Returns the copy of the string or NULL in case of error.
*) *)
xmlStrdupFunc = function(str: pchar): pchar; EXTDECL; xmlStrdupFunc = function(str: pchar): pchar; EXTDECL;
{$IFDEF NO_EXTERNAL_VARS}
PxmlStrdupFunc = ^xmlStrdupFunc;
{$ENDIF}
(* (*
* The 4 interfaces used for all memory handling within libxml. * The 4 interfaces used for all memory handling within libxml.
@ -170,4 +182,4 @@ function xmlMemStrdupLoc(str: pchar; _file: pchar; line: cint): pchar; EXTDECL;
//#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__) //#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__)
{$ENDIF} (* DEBUG_MEMORY_LOCATION *) {$ENDIF} (* DEBUG_MEMORY_LOCATION *)
{$ENDIF} {$ENDIF}