projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990604-1-src
[rocksndiamonds.git]
/
src
/
sound.h
diff --git
a/src/sound.h
b/src/sound.h
index ca97ff0a39f735a7cccb6ce700b8ee949cb20f71..2e934709e2ee041ebb0be6cc40c9aada059d4b84 100644
(file)
--- a/
src/sound.h
+++ b/
src/sound.h
@@
-22,8
+22,14
@@
#ifndef VOXWARE
#define VOXWARE
#endif
#ifndef VOXWARE
#define VOXWARE
#endif
+
+#if 0
/* where is the right declaration for 'ioctl'? */
extern void ioctl(long, long, void *);
/* where is the right declaration for 'ioctl'? */
extern void ioctl(long, long, void *);
+#else
+#include <sys/ioctl.h>
+#endif
+
#endif
#ifdef __FreeBSD__
#endif
#ifdef __FreeBSD__
@@
-119,22
+125,11
@@
struct SoundHeader_8SVX
char magic_8SVX[4];
};
char magic_8SVX[4];
};
-struct SoundHeader_WAV
-{
- char magic_RIFF[4];
- unsigned long header_size;
- char magic_WAVE[4];
- char some_stuff[24];
- char magic_DATA[4];
- unsigned long data_size;
-};
-
struct SoundInfo
{
char *name;
struct SoundInfo
{
char *name;
- byte *file_ptr;
byte *data_ptr;
byte *data_ptr;
- long
file_len,
data_len;
+ long data_len;
#ifdef MSDOS
SAMPLE *sample_ptr;
#endif
#ifdef MSDOS
SAMPLE *sample_ptr;
#endif