Bunch of renames + macros.

1 files changed, 6 insertions, 4 deletions

diff --git a/vcal.h b/vcal.h
index 8335cbc4..58d347c1 100644
--- a/vcal.h
+++ b/vcal.h
@@ -40,9 +40,11 @@ struct s_vevent {
 struct s_vevent;
 typedef struct s_vevent vevent;
 
-int vevent_init (vevent* ev, int init_size);
+int CONSTRUCTOR_DECL(vevent, int init_size);
+
+int CONSTRUCTOR_DECL(content_line);
+int CONSTRUCTOR_DECL(content_line, int keylen, int vallen);
 
-int init_content_line (content_line* c, int keylen, int vallen);
 int content_line_free (content_line* c);
 int content_line_copy (content_line* dest, content_line* src);
 
@@ -70,8 +72,8 @@ typedef struct {
 	vevent* events;
 } vcalendar;
 
-int init_vcalendar(vcalendar* cal);
-int free_vcalendar(vcalendar* cal);
+int CONSTRUCTOR_DECL(vcalendar);
+int free_vcalendar (vcalendar* cal);
 
 int push_event(vcalendar* cal, vevent* ev);