~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to tests/hello/hello.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:
7
7
#include <fcntl.h>
8
8
#include <signal.h>
9
9
 
10
 
#include "marker.h"
 
10
#include <ust/marker.h>
11
11
#include "usterr.h"
12
 
#include "tracer.h"
13
 
#include "marker-control.h"
14
 
#include "relay.h"
15
12
#include "tp.h"
16
13
 
17
14