phk at varnish-cache
Jul 30, 2012, 8:17 AM
Post #1 of 1
(41 views)
Permalink
|
commit d5c5d5b68cd62b633c25e44ff3bd9d93985c78d6
Author: Poul-Henning Kamp <phk [at] FreeBSD>
Date: Mon Jul 30 15:17:12 2012 +0000
Sigh...
It was a nice idea, but obviously compiler-writers and/or language
laywers are pussies who hate table-based programming :-)
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 37c2e6b..ae83bf7 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -75,18 +75,19 @@ SLTM(SessOpen, "Client connection opened",
"lport\n Local TCP port ('-' if !$log_local_addr)\n\n"
)
+/*
+ * XXX: compilers are _so_ picky, and won't let us do an #include
+ * XXX: in the middle of a macro invocation :-(
+ * XXX: If we could, these three lines would have described the
+ * XXX: 'reason' field below.
#define SESS_CLOSE(nm, desc) " " #nm "\n\t" desc "\n\n"
+#include <tbl/sess_close.h>
+#undef SESS_CLOSE
+*/
SLTM(SessClose, "Client connection closed",
"SessionClose is the last record for any client connection.\n\n"
"reason\n Why the connection closed.\n\n"
-#ifdef __clang__
-/*
- * GCC barfs at this construct, but we have no way to ask compiler
- * if it is _not_ a GCC compiler since CLANG also defines __GNUC__
- */
-#include <tbl/sess_close.h>
-#endif
"duration\n How long the session were open.\n\n"
"Nreq\n How many requests on session.\n\n"
"Npipe\n If 'pipe' were used on session.\n\n"
@@ -95,7 +96,6 @@ SLTM(SessClose, "Client connection closed",
"Bhdr\n Header bytes sent on session.\n\n"
"Bbody\n Body bytes sent on session.\n\n"
)
-#undef SESS_CLOSE
/*---------------------------------------------------------------------*/
_______________________________________________
varnish-commit mailing list
varnish-commit [at] varnish-cache
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
|
