changeset 22:d8f96a3bbea4 ML_lib_longjmp tip

Updated with newer PRMalloc header and some changes to (...)types.h
author Philipe Louchtch - de Raadt
date Sat, 12 Jul 2014 20:09:42 +0200
parents c05370bd62dd
children
files PR__primitive_data_types.h prmalloc.h
diffstat 2 files changed, 12 insertions(+), 64 deletions(-) [+]
line diff
     1.1 --- a/PR__primitive_data_types.h	Sun Jun 15 13:06:28 2014 +0200
     1.2 +++ b/PR__primitive_data_types.h	Sat Jul 12 20:09:42 2014 +0200
     1.3 @@ -36,18 +36,18 @@
     1.4  
     1.5  #else
     1.6  
     1.7 -typedef char               bool8;
     1.8 -typedef char               int8;
     1.9 -typedef char               uint8;
    1.10 -typedef short              int16;
    1.11 -typedef unsigned short     uint16;
    1.12 -typedef int                int32;
    1.13 -typedef unsigned int       uint32;
    1.14 -typedef unsigned int       bool32;
    1.15 -typedef long long          int64;
    1.16 -typedef unsigned long long uint64;
    1.17 -typedef float              float32;
    1.18 -typedef double             float64;
    1.19 +typedef char                   bool8;
    1.20 +typedef char                   int8;
    1.21 +typedef char                   uint8;
    1.22 +typedef short                  int16;
    1.23 +typedef unsigned short         uint16;
    1.24 +typedef int                    int32;
    1.25 +typedef unsigned int           uint32;
    1.26 +typedef unsigned int           bool32;
    1.27 +typedef long long int          int64;
    1.28 +typedef unsigned long long int uint64;
    1.29 +typedef float                  float32;
    1.30 +typedef double                 float64;
    1.31  
    1.32  #endif
    1.33  
     2.1 --- a/prmalloc.h	Sun Jun 15 13:06:28 2014 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,52 +0,0 @@
     2.4 -/*
     2.5 - *  Copyright 2009 OpenSourceCodeStewardshipFoundation.org
     2.6 - *  Licensed under GNU General Public License version 2
     2.7 - *
     2.8 - * Author: seanhalle@yahoo.com
     2.9 - *
    2.10 - * Created on November 14, 2009, 9:07 PM
    2.11 - */
    2.12 -
    2.13 -#ifndef _PRMALLOC_H
    2.14 -#define	_PRMALLOC_H
    2.15 -
    2.16 -#include <malloc.h>
    2.17 -#include <inttypes.h>
    2.18 -#include <math.h>
    2.19 -#include <PR__include/PR__primitive_data_types.h>
    2.20 -
    2.21 -void *
    2.22 -PR_int__malloc( size_t sizeRequested );
    2.23 -
    2.24 -void *
    2.25 -PR_int__malloc_aligned( size_t sizeRequested );
    2.26 -
    2.27 -void
    2.28 -PR_int__free( void *ptrToFree );
    2.29 -
    2.30 -//Use these in application code directly
    2.31 -#define \
    2.32 -PR__malloc  PR_WL__malloc
    2.33 -
    2.34 -#define \
    2.35 -PR__free    PR_WL__free
    2.36 -
    2.37 -//these are implemented in the PR leaf implementation
    2.38 -void *
    2.39 -PR_WL__malloc( int32  sizeRequested ); 
    2.40 -
    2.41 -void
    2.42 -PR_WL__free( void *ptrToFree );
    2.43 -
    2.44 -
    2.45 -/*Allocates memory from the external system -- higher overhead
    2.46 - */
    2.47 -void *
    2.48 -PR_ext__malloc_in_ext( size_t sizeRequested );
    2.49 -
    2.50 -/*Frees memory that was allocated in the external system -- higher overhead
    2.51 - */
    2.52 -void
    2.53 -PR_ext__free_in_ext( void *ptrToFree );
    2.54 -
    2.55 -#endif
    2.56 \ No newline at end of file