IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 12, 2015, 6:18:23 PM (11 years ago)
Author:
eugene
Message:

merge changes from EAM dev branch ohana.20150429

Location:
trunk/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Ohana

  • trunk/Ohana/src/libohana/include/ohana_allocate.h

    r33646 r38441  
    2626void  ohana_free (const char *file, int line, const char *func, void *in);
    2727void  ohana_memdump_func (int mode);
    28 void  ohana_memcheck_func (int mode);
     28int   ohana_memcheck_func (int mode);
    2929void  real_free (void *in);
    3030
     
    5656# else  /* below: not OHANA_MEMORY */
    5757
    58 # define ohana_memcheck(X) /* NOP */
     58# define ohana_memcheck(X) TRUE
    5959# define ohana_memdump(X) /* NOP */
    6060void  real_free (void *in);
Note: See TracChangeset for help on using the changeset viewer.