diff options
| -rw-r--r-- | runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/print.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 04e02ce7..6f047fcd 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,8 @@ +2006-04-11 Tom Zanussi <zanussi@us.ibm.com> + + * print.c (_stp_print_flush): Change TIMESTAMP_SIZE to + STP_TIMESTAMP_SIZE to avoid conflicts with Suse kernels. + 2006-04-10 Martin Hunt <hunt@redhat.com> * string.c (_stp_string_cat_cstr): No need to copy diff --git a/runtime/print.c b/runtime/print.c index 9addde60..0ba173ba 100644 --- a/runtime/print.c +++ b/runtime/print.c @@ -72,12 +72,12 @@ void _stp_print_flush (void) #else /* STP_RELAYFS */ /* size of timestamp, in bytes, including space */ -#define TIMESTAMP_SIZE (sizeof(int)) -#define STP_PRINT_BUF_START (TIMESTAMP_SIZE) +#define STP_TIMESTAMP_SIZE (sizeof(int)) +#define STP_PRINT_BUF_START (STP_TIMESTAMP_SIZE) /** Size of buffer, not including terminating NULL */ #ifndef STP_PRINT_BUF_LEN -#define STP_PRINT_BUF_LEN (8192 - TIMESTAMP_SIZE - 1) +#define STP_PRINT_BUF_LEN (8192 - STP_TIMESTAMP_SIZE - 1) #endif static char _stp_pbuf[NR_CPUS][STP_PRINT_BUF_LEN + STP_PRINT_BUF_START + 1]; @@ -99,7 +99,7 @@ void _stp_print_flush (void) return; *((int *)buf) = _stp_seq_inc(); - ret = _stp_transport_write(buf, _stp_pbuf_len[cpu] + TIMESTAMP_SIZE + 1); + ret = _stp_transport_write(buf, _stp_pbuf_len[cpu] + STP_TIMESTAMP_SIZE + 1); if (unlikely(ret < 0)) { #if 0 if (!atomic_read(&_stp_transport_failures)) |