History

Merge pull request #82 from DarthGandalf/elif

Fix build: "#elif with no expression"

Marco Martinelli committed 6 years ago

Commit 7ac7dcd2 parents a72025b fd150362 files · +7 −7Browse files

Unified · Split

2 files
  1. Receivers/unix/config.h.in +2 −2
  2. Receivers/unix/scream.c +5 −5
Receivers/unix/config.h.in+2−2
@@ -1,2 +1,2 @@
1#cmakedefine PULSEAUDIO_ENABLE1#cmakedefine01 PULSEAUDIO_ENABLE
2#cmakedefine ALSA_ENABLE2#cmakedefine01 ALSA_ENABLE
Receivers/unix/scream.c+5−5
@@ -19,11 +19,11 @@ · 18 unmodified lines
19 19
20#include "raw.h"20#include "raw.h"
21 21
22#ifdef PULSEAUDIO_ENABLE22#if PULSEAUDIO_ENABLE
23#include "pulseaudio.h"23#include "pulseaudio.h"
24#endif24#endif
25 25
26#ifdef ALSA_ENABLE26#if ALSA_ENABLE
27#include "alsa.h"27#include "alsa.h"
28#endif28#endif
29 29
@@ -108,7 +108,7 @@ int main(int argc, char*argv[]) { · 78 unmodified lines
108 // Command line options108 // Command line options
109 enum receiver_type receiver_mode = Multicast;109 enum receiver_type receiver_mode = Multicast;
110 110
111#ifdef PULSEAUDIO_ENABLE111#if PULSEAUDIO_ENABLE
112 enum output_type output_mode = Pulseaudio;112 enum output_type output_mode = Pulseaudio;
113#elif ALSA_ENABLE113#elif ALSA_ENABLE
114 enum output_type output_mode = Alsa;114 enum output_type output_mode = Alsa;
@@ -180,7 +180,7 @@ int main(int argc, char*argv[]) { · 65 unmodified lines
180 // initialize output180 // initialize output
181 switch (output_mode) {181 switch (output_mode) {
182 case Pulseaudio:182 case Pulseaudio:
183#ifdef PULSEAUDIO_ENABLE183#if PULSEAUDIO_ENABLE
184 if (verbosity) fprintf(stderr, "Using Pulseaudio output\n");184 if (verbosity) fprintf(stderr, "Using Pulseaudio output\n");
185 if (pulse_output_init(target_latency_ms, stream_name) != 0) {185 if (pulse_output_init(target_latency_ms, stream_name) != 0) {
186 return 1;186 return 1;
@@ -192,7 +192,7 @@ int main(int argc, char*argv[]) { · 5 unmodified lines
192#endif192#endif
193 break;193 break;
194 case Alsa:194 case Alsa:
195#ifdef ALSA_ENABLE195#if ALSA_ENABLE
196 if (verbosity) fprintf(stderr, "Using ALSA output\n");196 if (verbosity) fprintf(stderr, "Using ALSA output\n");
197 if (alsa_output_init(target_latency_ms, alsa_device) != 0) {197 if (alsa_output_init(target_latency_ms, alsa_device) != 0) {
198 return 1;198 return 1;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t