[master] 4e1e53b Remove some leftover defines from old api

[Martin Blix Grydeland]

commit 4e1e53b02db2b8186519db5c5de6f9bfcd79d1d5
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Jul 2 15:13:00 2013 +0200

    Remove some leftover defines from old api

diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h
index d718398..b5d10f8 100644
--- a/include/vapi/vsl.h
+++ b/include/vapi/vsl.h
@@ -39,15 +39,6 @@
 #include "vapi/vsm.h"
 #include "vapi/vsl_int.h"
 
-#define VSL_ARGS	"i:x:"
-
-#define VSL_i_USAGE	"[-i tag]"
-#define VSL_x_USAGE	"[-x tag]"
-
-#define VSL_USAGE	"[...] "		\
-			VSL_i_USAGE " "		\
-			VSL_x_USAGE
-
 struct VSL_data;
 struct VSLQ;
 
diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index 51e3766..46f5004 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -71,7 +71,6 @@ typedef VTAILQ_HEAD(,vslf)		vslf_list;
 
 struct VSL_data {
 	unsigned			magic;
-#undef VSL_MAGIC
 #define VSL_MAGIC			0x8E6C92AA
 
 	struct vsb			*diag;