From 0c6233d607e3cdb4d034c7e5078db99bffdae2aa Mon Sep 17 00:00:00 2001
From: Magnus Edenhill <magnus@edenhill.se>
Date: Tue, 6 Dec 2016 23:18:10 +0100
Subject: [PATCH] Fix timestamp support detection (compile time)

(cherry picked from commit b5e6f16feab952821e755de665db98bae3ed5a9a)
---
 format.c   | 28 ++++++++++++++--------------
 kafkacat.c |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/format.c b/format.c
index 93769150..08f7cf95 100644
--- a/format.c
+++ b/format.c
@@ -132,9 +132,9 @@ void fmt_parse (const char *fmt) {
                         case 'p':
                                 fmt_add(KC_FMT_PARTITION, NULL, 0);
                                 break;
-			case 'T':
-				fmt_add(KC_FMT_TIMESTAMP, NULL, 0);
-				break;
+                        case 'T':
+                                fmt_add(KC_FMT_TIMESTAMP, NULL, 0);
+                                break;
                         case '%':
                                 fmt_add(KC_FMT_STR, s, 1);
                                 break;
@@ -241,19 +241,19 @@ static void fmt_msg_output_str (FILE *fp,
                         r = fprintf(fp, "%"PRId32, rkmessage->partition);
                         break;
 
-		case KC_FMT_TIMESTAMP:
-		{
-#ifdef RD_KAFKA_TIMESTAMP_CREATE_TIME
-			rd_kafka_timestamp_type_t tstype;
-			r = fprintf(fp, "%"PRId64,
-				    rd_kafka_message_timestamp(rkmessage,
-							       &tstype));
+#if RD_KAFKA_VERSION >= 0x000902ff
+                case KC_FMT_TIMESTAMP:
+                {
+                        rd_kafka_timestamp_type_t tstype;
+                        r = fprintf(fp, "%"PRId64,
+                                    rd_kafka_message_timestamp(rkmessage,
+                                                               &tstype));
 #else
-			r = fprintf(fp, "-1");
+                        r = fprintf(fp, "-1");
 #endif
-			break;
-		}
-		}
+                        break;
+                }
+                }
 
 
                 if (r < 1)
diff --git a/kafkacat.c b/kafkacat.c
index 45e1a2d8..d2ae9690 100644
--- a/kafkacat.c
+++ b/kafkacat.c
@@ -904,8 +904,8 @@ static void __attribute__((noreturn)) usage (const char *argv0, int exitcode,
                 "                     as a binary big endian 32-bit signed integer\n"
                 "  %%k                 Message key\n"
                 "  %%K                 Message key length (or -1 for NULL)\n"
-#ifdef RD_KAFKA_TIMESTAMP_CREATE_TIME
-		"  %%T                 Message timestamp (milliseconds since epoch)\n"
+#if RD_KAFKA_VERSION >= 0x000902ff
+                "  %%T                 Message timestamp (milliseconds since epoch UTC)\n"
 #endif
                 "  %%t                 Topic\n"
                 "  %%p                 Partition\n"