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_ENABLE
2−#cmakedefine ALSA_ENABLE
1+#cmakedefine01 PULSEAUDIO_ENABLE
2+#cmakedefine01 ALSA_ENABLE
Receivers/unix/scream.c+5−5
@@ -19,11 +19,11 @@ · 18 unmodified lines
1919
2020 #include "raw.h"
2121
22−#ifdef PULSEAUDIO_ENABLE
22+#if PULSEAUDIO_ENABLE
2323 #include "pulseaudio.h"
2424 #endif
2525
26−#ifdef ALSA_ENABLE
26+#if ALSA_ENABLE
2727 #include "alsa.h"
2828 #endif
2929
@@ -108,7 +108,7 @@ int main(int argc, char*argv[]) { · 78 unmodified lines
108108 // Command line options
109109 enum receiver_type receiver_mode = Multicast;
110110
111−#ifdef PULSEAUDIO_ENABLE
111+#if PULSEAUDIO_ENABLE
112112 enum output_type output_mode = Pulseaudio;
113113 #elif ALSA_ENABLE
114114 enum output_type output_mode = Alsa;
@@ -180,7 +180,7 @@ int main(int argc, char*argv[]) { · 65 unmodified lines
180180 // initialize output
181181 switch (output_mode) {
182182 case Pulseaudio:
183−#ifdef PULSEAUDIO_ENABLE
183+#if PULSEAUDIO_ENABLE
184184 if (verbosity) fprintf(stderr, "Using Pulseaudio output\n");
185185 if (pulse_output_init(target_latency_ms, stream_name) != 0) {
186186 return 1;
@@ -192,7 +192,7 @@ int main(int argc, char*argv[]) { · 5 unmodified lines
192192 #endif
193193 break;
194194 case Alsa:
195−#ifdef ALSA_ENABLE
195+#if ALSA_ENABLE
196196 if (verbosity) fprintf(stderr, "Using ALSA output\n");
197197 if (alsa_output_init(target_latency_ms, alsa_device) != 0) {
198198 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