diff options
author | Dave Brolley <brolley@redhat.com> | 2009-06-22 11:37:08 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-06-22 11:37:08 -0400 |
commit | d6454850dd3c9d74b700924b56378c4c9ab9fa57 (patch) | |
tree | 6665a24339ca689b1156ea7e93d4f93811c3f794 /runtime/print.c | |
parent | d729143af5242b17645d3f405141918940680894 (diff) | |
parent | 4116c576d5654287b0af598aee4a14eb2af73224 (diff) | |
download | systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.gz systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.xz systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/print.c')
-rw-r--r-- | runtime/print.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/runtime/print.c b/runtime/print.c index 964a73c2..69e04073 100644 --- a/runtime/print.c +++ b/runtime/print.c @@ -13,6 +13,8 @@ #include "string.h" +#include "vsprintf.c" +#include "print.h" #include "transport/transport.c" #include "vsprintf.c" @@ -86,14 +88,8 @@ static void _stp_print_cleanup (void) #endif #if !defined(RELAY_GUEST) -/* The relayfs API changed between 2.6.15 and 2.6.16. */ -/* Use the appropriate print flush function. */ -#ifdef STP_OLD_TRANSPORT -#include "print_old.c" -#else -#include "print_new.c" -#endif +#include "print_flush.c" #if defined(RELAY_HOST) EXPORT_SYMBOL_GPL(EXPORT_FN(stp_print_flush)); #endif |