~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to ustd/lowlevel.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:
19
19
 
20
20
#include "tracer.h"
21
21
#include "ustd.h"
22
 
#include "localerr.h"
 
22
#include "usterr.h"
23
23
 
24
24
/* This truncates to an offset in the buffer. */
25
25
#define USTD_BUFFER_TRUNC(offset, bufinfo) \