patch from VorteX which removes special menu behavior for

[xonotic/darkplaces.git] / snd_oss.c

diff --git a/snd_oss.c b/snd_oss.c
index c3a67aaf7be3397e8adb38cdf0531c984a28874d..bde3d50836e48178e600f95591b7824d3e6e169c 100644 (file)
--- a/snd_oss.c
+++ b/snd_oss.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // OSS module, used by Linux and FreeBSD
 
+#include "quakedef.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -27,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/soundcard.h>
 #include <unistd.h>
 
-#include "quakedef.h"
 #include "snd_main.h"
 
 
@@ -61,7 +61,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
                if (suggested != NULL)
                {
-                       memcpy(suggested, requested, sizeof(suggested));
+                       memcpy(suggested, requested, sizeof(*suggested));
 
                        if (requested->width < 1)
                                suggested->width = 1;
@@ -116,7 +116,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        {
                if (ioctl_param != prev_value && suggested != NULL)
                {
-                       memcpy(suggested, requested, sizeof(suggested));
+                       memcpy(suggested, requested, sizeof(*suggested));
 
                        if (ioctl_param == AFMT_S16_NE)
                                suggested->width = 2;
@@ -137,7 +137,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        {
                if (ioctl_param != requested->channels && suggested != NULL)
                {
-                       memcpy(suggested, requested, sizeof(suggested));
+                       memcpy(suggested, requested, sizeof(*suggested));
                        suggested->channels = ioctl_param;
                }
 
@@ -154,7 +154,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        {
                if ((unsigned int)ioctl_param != requested->speed && suggested != NULL)
                {
-                       memcpy(suggested, requested, sizeof(suggested));
+                       memcpy(suggested, requested, sizeof(*suggested));
                        suggested->speed = ioctl_param;
                }