~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libmallocwrap/mallocwrap.c

  • Committer: Pierre-Marc Fournier
  • Date: 2009-10-27 22:58:15 UTC
  • mfrom: (232.1.5)
  • Revision ID: git-v1:aa08b4413291fabcbd1b1144377d37034ad361de
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
        include/ust/marker.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#include <sys/types.h>
21
21
#include <stdio.h>
22
22
 
23
 
#include "marker.h"
 
23
#include <ust/marker.h>
24
24
 
25
25
#if 0
26
26
INTERCEPT_PROTOTYPE(void, malloc, size_t size)