casa-mp-base

--- peb.c.orig  2010-03-08 20:12:02.000000000 -0600

+++ peb.c   2012-10-01 11:54:39.000000000 -0700

@@ -297,8 +297,8 @@

        peb_link * alink = NULL;

        ei_cnode * ec = NULL;

-       list_entry * le ;

-       list_entry * newle;

+       zend_rsrc_list_entry * le ;

+       zend_rsrc_list_entry * newle;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,"ss|l",&node,&node_len,&secret,&secret_len,&tmo)==FAILURE) {

                RETURN_FALSE;

@@ -368,10 +368,10 @@

        if (persistent) {

                PEB_G(num_link)++;

                PEB_G(num_persistent)++;

-               newle = pemalloc(sizeof(list_entry),persistent);

+               newle = pemalloc(sizeof(zend_rsrc_list_entry),persistent);

                newle->ptr = alink;

                newle->type = le_plink;

-               zend_hash_update(&EG(persistent_list), key, key_len+1, newle,sizeof(list_entry), NULL );

+               zend_hash_update(&EG(persistent_list), key, key_len+1, newle,sizeof(zend_rsrc_list_entry), NULL );

                PEB_G(default_link) = Z_LVAL_P(return_value TSRMLS_CC);

                ZEND_REGISTER_RESOURCE(return_value, alink, le_plink);

        }

@@ -693,7 +693,7 @@

 }

 /* }}} */

-int _peb_encode_term(ei_x_buff* x,char **fmt,int * fmtpos, HashTable *arr, unsigned long * arridx)

+static void _peb_encode_term(ei_x_buff* x,char **fmt,int * fmtpos, HashTable *arr, unsigned long * arridx)

 {

        char* p = *fmt + *fmtpos;

        int i,v;

@@ -802,7 +802,7 @@

 }

-int _peb_encode(ei_x_buff* x, char** fmt, int fmt_len, int * fmtpos, HashTable *arr, unsigned long * arridx)

+static void _peb_encode(ei_x_buff* x, char** fmt, int fmt_len, int * fmtpos, HashTable *arr, unsigned long * arridx)

 {

        /*

        ~a - an atom, char*