Changeset 97 for GPL/branches

Timestamp:

May 6, 2007, 8:55:06 AM (19 years ago)

Author:

Brendan Oakley

Message:

Workarounds for a few compile errors

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• compat_22.h (modified) (2 diffs)
• typedefs.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

@@ -471 +471 @@
 
 #define ATOMIC_INIT(i)  { (i) }
-
+#if 0 /* Brendan: This is not ALSA code but something added. Fails compile?  */
 /**
  * atomic_dec_and_test - decrement and test
@@ -488 +488 @@
     return 0;
 }
+#endif /* Brendan */
 
 /**

GPL/branches/alsa-resync1/alsa-kernel/include/sound/typedefs.h

@@ -22 +22 @@
 typedef struct snd_kcontrol_volatile snd_kcontrol_volatile_t;
 typedef struct snd_kctl_event snd_kctl_event_t;
-typedef struct snd_aes_iec958 snd_aes_iec958_t;
-typedef struct snd_ctl_card_info snd_ctl_card_info_t;
-typedef struct snd_ctl_elem_id snd_ctl_elem_id_t;
-typedef struct snd_ctl_elem_list snd_ctl_elem_list_t;
-typedef struct snd_ctl_elem_info snd_ctl_elem_info_t;
-typedef struct snd_ctl_elem_value snd_ctl_elem_value_t;
-typedef struct snd_ctl_event snd_ctl_event_t;
+//typedef struct snd_aes_iec958 snd_aes_iec958_t;
+//typedef struct snd_ctl_card_info snd_ctl_card_info_t;
+//typedef struct snd_ctl_elem_id snd_ctl_elem_id_t;
+//typedef struct snd_ctl_elem_list snd_ctl_elem_list_t;
+//typedef struct snd_ctl_elem_info snd_ctl_elem_info_t;
+//typedef struct snd_ctl_elem_value snd_ctl_elem_value_t;
+//typedef struct snd_ctl_event snd_ctl_event_t;
 #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
 typedef struct snd_mixer_oss snd_mixer_oss_t;