diff -u -r1.54 -r1.55
--- alsa-lib/include/mixer.h	16 Jun 2005 11:59:26 -0000	1.54
+++ alsa-lib/include/mixer.h	23 Jun 2005 07:44:36 -0000	1.55
@@ -76,13 +76,13 @@
 
 /**
  * \brief Event callback for the mixer class
- * \param class Mixer class
+ * \param class_ Mixer class
  * \param mask Event mask (SND_CTL_EVENT_*)
  * \param helem HCTL element which invoked the event
  * \param melem Mixer element associated to HCTL element
  * \return zero if success, otherwise a negative error value
  */
-typedef int (*snd_mixer_event_t)(snd_mixer_class_t *class, unsigned int mask,
+typedef int (*snd_mixer_event_t)(snd_mixer_class_t *class_, unsigned int mask,
 				 snd_hctl_elem_t *helem, snd_mixer_elem_t *melem);
 
 
@@ -123,7 +123,7 @@
 void snd_mixer_elem_set_callback_private(snd_mixer_elem_t *obj, void * val);
 snd_mixer_elem_type_t snd_mixer_elem_get_type(const snd_mixer_elem_t *obj);
 
-int snd_mixer_class_register(snd_mixer_class_t *class, snd_mixer_t *mixer);
+int snd_mixer_class_register(snd_mixer_class_t *class_, snd_mixer_t *mixer);
 int snd_mixer_add_elem(snd_mixer_t *mixer, snd_mixer_elem_t *elem);
 int snd_mixer_remove_elem(snd_mixer_t *mixer, snd_mixer_elem_t *elem);
 int snd_mixer_elem_new(snd_mixer_elem_t **elem,
@@ -131,7 +131,7 @@
 		       int compare_weight,
 		       void *private_data,
 		       void (*private_free)(snd_mixer_elem_t *elem));
-int snd_mixer_elem_add(snd_mixer_elem_t *elem, snd_mixer_class_t *class);
+int snd_mixer_elem_add(snd_mixer_elem_t *elem, snd_mixer_class_t *class_);
 int snd_mixer_elem_remove(snd_mixer_elem_t *elem);
 void snd_mixer_elem_free(snd_mixer_elem_t *elem);
 int snd_mixer_elem_info(snd_mixer_elem_t *elem);
@@ -150,14 +150,14 @@
 int snd_mixer_class_malloc(snd_mixer_class_t **ptr);
 void snd_mixer_class_free(snd_mixer_class_t *obj);
 void snd_mixer_class_copy(snd_mixer_class_t *dst, const snd_mixer_class_t *src);
-snd_mixer_t *snd_mixer_class_get_mixer(const snd_mixer_class_t *class);
-snd_mixer_event_t snd_mixer_class_get_event(const snd_mixer_class_t *class);
-void *snd_mixer_class_get_private(const snd_mixer_class_t *class);
-snd_mixer_compare_t snd_mixer_class_get_compare(const snd_mixer_class_t *class);
-int snd_mixer_class_set_event(snd_mixer_class_t *class, snd_mixer_event_t event);
-int snd_mixer_class_set_private(snd_mixer_class_t *class, void *private_data);
-int snd_mixer_class_set_private_free(snd_mixer_class_t *class, void (*private_free)(snd_mixer_class_t *class));
-int snd_mixer_class_set_compare(snd_mixer_class_t *class, snd_mixer_compare_t compare);
+snd_mixer_t *snd_mixer_class_get_mixer(const snd_mixer_class_t *class_);
+snd_mixer_event_t snd_mixer_class_get_event(const snd_mixer_class_t *class_);
+void *snd_mixer_class_get_private(const snd_mixer_class_t *class_);
+snd_mixer_compare_t snd_mixer_class_get_compare(const snd_mixer_class_t *class_);
+int snd_mixer_class_set_event(snd_mixer_class_t *class_, snd_mixer_event_t event);
+int snd_mixer_class_set_private(snd_mixer_class_t *class_, void *private_data);
+int snd_mixer_class_set_private_free(snd_mixer_class_t *class_, void (*private_free)(snd_mixer_class_t *class_));
+int snd_mixer_class_set_compare(snd_mixer_class_t *class_, snd_mixer_compare_t compare);
 
 /**
  *  \defgroup SimpleMixer Simple Mixer Interface