Changeset 3006

Show
Ignore:
Timestamp:
12/07/99 11:10:14 (14 years ago)
Author:
ucacoxh
Message:

- removed SunOS specifics from config_unix.h.
- removed old Linux and SGI specifics. All catered for by configure tests.
- pushed audio_types.h include out of config_{unix,win32}.h.

Location:
rat/trunk
Files:
33 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/Makefile.in

    r3003 r3006  
    149149 
    150150depend: 
    151         makedepend $(INCLUDE) $(ALL_SRCS) 
     151        makedepend $(X_CFLAGS) $(INCLUDE) $(ALL_SRCS) 
    152152# DO NOT DELETE THIS LINE 
  • rat/trunk/auddev_sgi.c

    r2988 r3006  
    1616#include "auddev_sgi.h" 
    1717#include "debug.h" 
     18#include <audio.h> 
    1819 
    1920#define QSIZE           16000           /* Two seconds for now... */ 
  • rat/trunk/audio.c

    r2958 r3006  
    2020#include "memory.h" 
    2121#include "debug.h" 
     22#include "audio_types.h" 
    2223#include "codec_types.h" 
    2324#include "codec.h" 
  • rat/trunk/audio_util.c

    r2958 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "audio_util.h" 
    1718#include "debug.h" 
  • rat/trunk/cc_layered.c

    r2958 r3006  
    1313#include "config_unix.h" 
    1414#include "config_win32.h" 
    15  
     15#include "audio_types.h" 
    1616#include "codec_types.h" 
    1717#include "codec.h" 
  • rat/trunk/cc_rdncy.c

    r2958 r3006  
    1313#include "config_unix.h" 
    1414#include "config_win32.h" 
    15  
     15#include "audio_types.h" 
    1616#include "codec_types.h" 
    1717#include "codec.h" 
  • rat/trunk/cc_vanilla.c

    r2958 r3006  
    1212#include "config_unix.h" 
    1313#include "config_win32.h" 
    14  
     14#include "audio_types.h" 
    1515#include "codec_types.h" 
    1616#include "codec.h" 
  • rat/trunk/channel.c

    r2995 r3006  
    1212#include "config_unix.h" 
    1313#include "config_win32.h" 
    14  
     14#include "audio_types.h" 
    1515#include "codec_types.h" 
    1616#include "channel.h" 
  • rat/trunk/codec.c

    r2958 r3006  
    1515#include "memory.h" 
    1616#include "util.h" 
    17  
     17#include "audio_types.h" 
    1818#include "codec_types.h" 
    1919#include "codec.h" 
  • rat/trunk/codec_state.c

    r2314 r3006  
    1717#include "debug.h" 
    1818#include "memory.h" 
     19#include "audio_types.h" 
    1920#include "codec_types.h" 
    2021#include "codec.h" 
  • rat/trunk/codec_types.c

    r2966 r3006  
    1212#include "config_unix.h" 
    1313#include "config_win32.h" 
    14  
     14#include "audio_types.h" 
    1515#include "codec_types.h" 
    16  
    1716#include "util.h" 
    1817#include "debug.h" 
  • rat/trunk/config_unix.h

    r2997 r3006  
    8989#endif 
    9090 
    91 extern int h_errno; 
    92  
    93 typedef unsigned char   byte; 
    94 typedef char    ttl_t; 
    95 typedef int     fd_t; 
    96  
    9791#ifndef TRUE 
    9892#define FALSE   0 
     
    111105#endif 
    112106 
    113 #ifdef __NetBSD__ 
    114 #include <sys/stat.h> 
    115 #include <fcntl.h> 
    116 #include <sys/audioio.h> 
    117107#endif 
    118  
    119 #ifdef SunOS 
    120 #define NEED_INET_PTON 
    121 #define AUDIO_CD         4 
    122 #define EXIT_SUCCESS 0 
    123 #define EXIT_FAILURE 7 
    124 #include <ctype.h> 
    125 #include <sun/audioio.h> 
    126 #include <multimedia/ulaw2linear.h> 
    127 #include <string.h> 
    128 #include <stdio.h> 
    129 #include <sys/types.h> 
    130 #include <sys/time.h> 
    131 #include <sys/socket.h> 
    132 #include <memory.h> 
    133 int     gethostname(char *name, int namelen); 
    134 int     gettimeofday(struct timeval *tp, struct timezone *tzp); 
    135 double  drand48(); 
    136 void    srand48(long seedval); 
    137 long    lrand48(); 
    138 int     setsockopt(int s, int level, int optname, const char *optval, int optlen); 
    139 void    perror(); 
    140 int     printf(char *format, ...); 
    141 int     fprintf(FILE *stream, char *format, ...); 
    142 int     fclose(FILE *stream); 
    143 int     fread(void *ptr, int size, int nitems, FILE *stream); 
    144 int     fwrite(void *ptr, int size, int nitems, FILE *stream); 
    145 int     fflush(FILE *stream); 
    146 void    bzero(char *b, int length); 
    147 void    bcopy(char *b1, char *b2, int length); 
    148 int     connect(int s, struct sockaddr *name, int namelen); 
    149 int     select(int width, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); 
    150 int     bind(int s, struct sockaddr *name, int namelen); 
    151 int     socket(int domain, int type, int protocol); 
    152 int     sendto(int s, char *msg, int len, int flags, struct sockaddr *to, int tolen); 
    153 int     writev(int fd, struct iovec *iov, int iovcnt); 
    154 int     recvfrom(int s, char *buf, int len, int flags, struct sockaddr *from, int *fromlen); 
    155 int     close(int fd); 
    156 int     ioctl(int fd, int request, caddr_t arg); 
    157 int     sscanf(char *s, char *format, ...); 
    158 time_t  time(time_t *tloc); 
    159 int     strcasecmp(char *s1, char *s2); 
    160 long    strtol(char *str, char **ptr, int base); 
    161 int     toupper(int c); 
    162 #define memmove(dst, src, len)  bcopy((char *) src, (char *) dst, len) 
    163 #endif 
    164  
    165 #ifdef IRIX 
    166 #define NEED_INET_PTON 
    167 #include <audio.h> 
    168 #include "usleep.h" 
    169 #endif 
    170  
    171 #ifdef Linux 
    172 #define DIFF_BYTE_ORDER  1 
    173 #include <sys/soundcard.h> 
    174 #include <sys/stat.h> 
    175 #include <fcntl.h> 
    176 void *memcpy(void *dest, const void *src, size_t n); 
    177 int   memcmp(const void *s1, const void *s2, size_t n); 
    178 #endif /* Linux */ 
    179  
    180 #endif  
    181  
    182 #include "audio_types.h" 
    183  
    184 #endif 
  • rat/trunk/config_win32.h

    r2980 r3006  
    7676 
    7777#include <time.h>               /* For clock_t */ 
    78 #include "audio_types.h" 
    7978#include "usleep.h" 
    8079 
  • rat/trunk/convert_extra.c

    r2958 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "converter_types.h" 
    1718#include "convert_extra.h" 
  • rat/trunk/convert_linear.c

    r2958 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "converter_types.h" 
    1718#include "convert_linear.h" 
  • rat/trunk/convert_sinc.c

    r2958 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "converter_types.h" 
    1718#include "convert_sinc.h" 
  • rat/trunk/convert_util.c

    r2904 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "converter_types.h" 
    1718#include "convert_util.h" 
  • rat/trunk/converter.c

    r2958 r3006  
    1616#include "memory.h" 
    1717#include "util.h" 
     18#include "audio_types.h" 
    1819#include "converter_types.h" 
    1920#include "converter.h" 
  • rat/trunk/cushion.c

    r2958 r3006  
    1818#include "memory.h" 
    1919#include "cushion.h" 
     20#include "audio_types.h" 
    2021#include "codec_types.h" 
    2122#include "audio.h" 
  • rat/trunk/cx_wbs.c

    r2314 r3006  
    1414#include "config_unix.h" 
    1515#include "config_win32.h" 
     16#include "audio_types.h" 
    1617#include "cx_wbs.h" 
    1718 
  • rat/trunk/main_engine.c

    r2962 r3006  
    1616#include "debug.h" 
    1717#include "memory.h" 
     18#include "audio_types.h" 
    1819#include "codec_types.h" 
    1920#include "codec.h" 
  • rat/trunk/pdb.c

    r2961 r3006  
    2323#include "btree.h" 
    2424#include "channel_types.h" 
     25#include "audio_types.h" 
    2526#include "codec_types.h" 
    2627#include "timers.h" 
  • rat/trunk/render_3D.c

    r2958 r3006  
    1515#include "config_unix.h" 
    1616#include "config_win32.h" 
     17#include <math.h> 
     18#include "audio_types.h" 
     19#include "codec_types.h" 
    1720#include "memory.h" 
    1821#include "util.h" 
  • rat/trunk/render_3D.h

    r2314 r3006  
    1515#define __RENDER_3D_H__ 
    1616 
    17 #include <math.h> 
    18 #include "codec_types.h" 
    1917struct s_render_3D_dbentry; 
    2018 
  • rat/trunk/session.h

    r2958 r3006  
    1717#include "net_udp.h" 
    1818#include "ts.h" 
     19#include "audio_types.h" 
    1920#include "converter_types.h" 
    2021#include "repair_types.h" 
  • rat/trunk/sndfile.c

    r2958 r3006  
    1616#include "debug.h" 
    1717#include "memory.h" 
     18#include "audio_types.h" 
    1819#include "codec_types.h" 
    1920#include "codec_g711.h" 
  • rat/trunk/sndfile_au.c

    r2958 r3006  
    1717#include "memory.h" 
    1818#include "util.h" 
     19#include "audio_types.h" 
    1920#include "codec_g711.h" 
    2021#include "sndfile_types.h" 
  • rat/trunk/sndfile_raw.c

    r2585 r3006  
    1717#include "memory.h" 
    1818#include "util.h" 
     19#include "audio_types.h" 
    1920#include "codec_g711.h" 
    2021#include "sndfile_types.h" 
  • rat/trunk/sndfile_wav.c

    r2958 r3006  
    1717#include "memory.h" 
    1818#include "util.h" 
     19#include "audio_types.h" 
    1920#include "codec_g711.h" 
    2021#include "sndfile_types.h" 
  • rat/trunk/source.c

    r2995 r3006  
    1515#include "config_unix.h" 
    1616#include "config_win32.h" 
    17  
     17#include "audio_types.h" 
     18#include "codec_types.h" 
    1819#include "ts.h" 
    1920#include "playout.h" 
    2021#include "channel.h" 
    2122#include "channel_types.h" 
    22 #include "codec_types.h" 
    2323#include "codec.h" 
    2424#include "codec_state.h" 
  • rat/trunk/transcoder.c

    r2314 r3006  
    1717#include "config_win32.h" 
    1818#include "memory.h" 
     19#include "audio_types.h" 
    1920#include "transcoder.h" 
    2021 
  • rat/trunk/transmit.c

    r2958 r3006  
    1616#include "memory.h" 
    1717#include "debug.h" 
     18#include "audio_types.h" 
    1819#include "codec_types.h" 
    1920#include "codec.h" 
  • rat/trunk/ui.c

    r2959 r3006  
    1818#include "memory.h" 
    1919#include "version.h" 
     20#include "audio_types.h" 
    2021#include "codec_types.h" 
    2122#include "codec_state.h"