avoid name conflicts with glib

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13827 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 275a5c6c61f5c8f406c7e975be094e586f899c43..9bdc92a57860dee8805dd8a18c11f4f177a611b4 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-20  Ken Raeburn  <raeburn@mit.edu>
+
+       * gssapiP_generic.h (g_*): For every g_ function declared here,
+       first define the name as a macro using a gssint_ prefix to avoid
+       conflicting with glib function names.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
        * gssapi.hin, gssapiP_generic.h: Make prototypes unconditional.

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index d6962f1aa9d45436a51ec39d75c71eed605e2a4a..fe69fd2fbdf557a70106f8c8de797380811357f9 100644 (file)
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -97,6 +97,38 @@
 
 /** helper functions **/
 
+/* hide names from applications, especially glib applications */
+#define        g_set_init              gssint_g_set_init
+#define        g_set_destroy           gssint_g_set_destroy
+#define        g_set_entry_add         gssint_g_set_entry_add
+#define        g_set_entry_delete      gssint_g_set_entry_delete
+#define        g_set_entry_get         gssint_g_set_entry_get
+#define        g_save_name             gssint_g_save_name
+#define        g_save_cred_id          gssint_g_save_cred_id
+#define        g_save_ctx_id           gssint_g_save_ctx_id
+#define        g_validate_name         gssint_g_validate_name
+#define        g_validate_cred_id      gssint_g_validate_cred_id
+#define        g_validate_ctx_id       gssint_g_validate_ctx_id
+#define        g_delete_name           gssint_g_delete_name
+#define        g_delete_cred_id        gssint_g_delete_cred_id
+#define        g_delete_ctx_id         gssint_g_delete_ctx_id
+#define        g_make_string_buffer    gssint_g_make_string_buffer
+#define        g_copy_OID_set          gssint_g_copy_OID_set
+#define        g_token_size            gssint_g_token_size
+#define        g_make_token_header     gssint_g_make_token_header
+#define        g_verify_token_header   gssint_g_verify_token_header
+#define        g_display_major_status  gssint_g_display_major_status
+#define        g_display_com_err_status gssint_g_display_com_err_status
+#define        g_order_init            gssint_g_order_init
+#define        g_order_check           gssint_g_order_check
+#define        g_order_free            gssint_g_order_free
+#define        g_queue_size            gssint_g_queue_size
+#define        g_queue_externalize     gssint_g_queue_externalize
+#define        g_queue_internalize     gssint_g_queue_internalize
+#define        g_canonicalize_host     gssint_g_canonicalize_host
+#define        g_local_host_name       gssint_g_local_host_name
+#define        g_strdup                gssint_g_strdup
+
 typedef struct _g_set *g_set;
 
 int g_set_init (g_set *s);