← Back to branch summary

~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/serialize.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:
libust/serialize.c
32
32
#include <string.h>
33
33
#include <stdint.h>
34
34
 
35
 
#include "kernelcompat.h"
 
35
#include <ust/kernelcompat.h>
36
36
#define _LGPL_SOURCE
37
37
#include <urcu-bp.h>
38
38
#include <urcu/rculist.h>