chan_oss: Compile in Solaris 11.
authorAlexander Traud <pabstraud@compuserve.com>
Thu, 21 Jun 2018 10:07:21 +0000 (12:07 +0200)
committerAlexander Traud <pabstraud@compuserve.com>
Thu, 21 Jun 2018 10:07:21 +0000 (12:07 +0200)
M_READ existed already and was conflicting in name.

Change-Id: I02108e07ae7d2dc314fe1e6c706c17731095a3e4

channels/chan_oss.c

index 7866813..ed4391b 100644 (file)
@@ -255,7 +255,12 @@ struct chan_oss_pvt {
        char *name;
        int total_blocks;                       /*!< total blocks in the output device */
        int sounddev;
-       enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
+       enum {
+               CHAN_OSS_DUPLEX_UNSET,
+               CHAN_OSS_DUPLEX_FULL,
+               CHAN_OSS_DUPLEX_READ,
+               CHAN_OSS_DUPLEX_WRITE
+       } duplex;
        int autoanswer;             /*!< Boolean: whether to answer the immediately upon calling */
        int autohangup;             /*!< Boolean: whether to hangup the call when the remote end hangs up */
        int hookstate;              /*!< Boolean: 1 if offhook; 0 if onhook */
@@ -318,7 +323,7 @@ struct video_desc *get_video_desc(struct ast_channel *c)
 }
 static struct chan_oss_pvt oss_default = {
        .sounddev = -1,
-       .duplex = M_UNSET,                      /* XXX check this */
+       .duplex = CHAN_OSS_DUPLEX_UNSET, /* XXX check this */
        .autoanswer = 1,
        .autohangup = 1,
        .queuesize = QUEUE_SIZE,
@@ -480,7 +485,7 @@ static int setformat(struct chan_oss_pvt *o, int mode)
        if (o->sounddev >= 0) {
                ioctl(o->sounddev, SNDCTL_DSP_RESET, 0);
                close(o->sounddev);
-               o->duplex = M_UNSET;
+               o->duplex = CHAN_OSS_DUPLEX_UNSET;
                o->sounddev = -1;
        }
        if (mode == O_CLOSE)            /* we are done */
@@ -513,16 +518,16 @@ static int setformat(struct chan_oss_pvt *o, int mode)
                res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt);
                if (res == 0 && (fmt & DSP_CAP_DUPLEX)) {
                        ast_verb(2, "Console is full duplex\n");
-                       o->duplex = M_FULL;
+                       o->duplex = CHAN_OSS_DUPLEX_FULL;
                };
                break;
 
        case O_WRONLY:
-               o->duplex = M_WRITE;
+               o->duplex = CHAN_OSS_DUPLEX_WRITE;
                break;
 
        case O_RDONLY:
-               o->duplex = M_READ;
+               o->duplex = CHAN_OSS_DUPLEX_READ;
                break;
        }
 
@@ -1416,7 +1421,7 @@ openit:
                ast_verb(1, "Turn off OSS support by adding " "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n");
                goto error;
        }
-       if (o->duplex != M_FULL)
+       if (o->duplex != CHAN_OSS_DUPLEX_FULL)
                ast_log(LOG_WARNING, "XXX I don't work right with non " "full-duplex sound cards XXX\n");
 #endif /* TRYOPEN */