diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/dabInputFifo.h | |
parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/dabInputFifo.h')
-rw-r--r-- | src/dabInputFifo.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/dabInputFifo.h b/src/dabInputFifo.h index e5f5206..99edac6 100644 --- a/src/dabInputFifo.h +++ b/src/dabInputFifo.h @@ -1,6 +1,11 @@ /* Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) + + Copyright (C) 2016 + Matthias P. Braendli, matthias.braendli@mpb.li + + http://www.opendigitalradio.org */ /* This file is part of ODR-DabMux. @@ -19,19 +24,18 @@ along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DAB_INPUT_FIFO_H -#define DAB_INPUT_FIFO_H +#pragma once #ifdef HAVE_CONFIG_H -# include "config.h" +# include "config.h" #endif + #include "dabInputFile.h" #include "Log.h" #ifdef _WIN32 # include <io.h> - # define sem_t HANDLE # define O_NONBLOCK 0 #else @@ -97,4 +101,3 @@ void* dabInputFifoThread(void* args); # endif #endif -#endif // DAB_INPUT_FIFO_H |