$NetBSD: patch-af,v 1.1 2007/06/15 14:26:23 darcy Exp $ --- src/lib/prop.h.orig 2007-06-14 12:07:07.000000000 -0400 +++ src/lib/prop.h @@ -48,11 +48,11 @@ typedef enum { PROP_TYPE_IP, PROP_TYPE_MULTICHOICE, PROP_TYPE_STORAGE, - PROP_TYPE_STRING, + gg_PROP_TYPE_STRING, PROP_TYPE_TIMESTAMP, NUM_PROP_TYPES -} prop_type_t; +} gg_prop_type_t; /** * Callback signature definition. @@ -160,7 +160,7 @@ typedef gboolean *(*prop_get_boolean_t) typedef struct prop_def { gchar *name; /**< key used in the config file */ gchar *desc; /**< description of the property */ - prop_type_t type; + gg_prop_type_t type; union { prop_def_guint32_t guint32; prop_def_guint64_t guint64;