diff options
author | Stan Cox <scox@redhat.com> | 2009-06-19 14:06:52 -0400 |
---|---|---|
committer | Stan Cox <scox@redhat.com> | 2009-06-19 14:06:52 -0400 |
commit | d138d3d71a1685c53cc5c2b72ed8ae64d3e012d2 (patch) | |
tree | 966ff2622c07fb84513b487482a1a1f46bae5dfc /runtime/print.c | |
parent | 45148f5b5e371ff852dbbb08d83c5e87932b372e (diff) | |
parent | eba61c56888482553551a16ec651444a583522e0 (diff) | |
download | systemtap-steved-d138d3d71a1685c53cc5c2b72ed8ae64d3e012d2.tar.gz systemtap-steved-d138d3d71a1685c53cc5c2b72ed8ae64d3e012d2.tar.xz systemtap-steved-d138d3d71a1685c53cc5c2b72ed8ae64d3e012d2.zip |
Merge branch 'master' of ssh://sourceware.org/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 |