~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to tests/fork/fork.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:
2
2
#include <unistd.h>
3
3
#include <sys/types.h>
4
4
 
5
 
#include "marker.h"
6
 
 
 
5
#include <ust/marker.h>
7
6
 
8
7
int main(int argc, char **argv, char *env[])
9
8
{