rename Event to VEvent (conflicts with spice's event)

1 files changed, 5 insertions, 0 deletions

diff --git a/vcardt.h b/vcardt.h
index 2e8ffe7..44f41f8 100644
--- a/vcardt.h
+++ b/vcardt.h
@@ -3,13 +3,18 @@
  */
 #ifndef VCARDT_H
 #define VCARDT_H 1
+
 /*
  * these should come from some common spice header file
  */
 #include <assert.h>
+#ifndef ASSERT
 #define ASSERT assert
+#endif
+#ifndef MIN
 #define MIN(x,y) ((x)>(y)?(y):(x))
 #define MAX(x,y) ((x)>(y)?(x):(y))
+#endif
 
 typedef struct VCardStruct VCard;
 typedef struct VCardAPDUStruct VCardAPDU;