summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2014-04-22 11:44:54 +0200
committerLars-Dominik Braun <lars@6xq.net>2014-04-22 11:44:54 +0200
commit4d8ad7d87072bc1631d0b949930f4869e56b7b99 (patch)
tree304498a232ad457ff6937d94266e3a86c5d3eab5
parent274324aab47c51d6c07ace5e219d196077c3e5d1 (diff)
downloadpianobar-windows-4d8ad7d87072bc1631d0b949930f4869e56b7b99.tar.gz
pianobar-windows-4d8ad7d87072bc1631d0b949930f4869e56b7b99.tar.bz2
pianobar-windows-4d8ad7d87072bc1631d0b949930f4869e56b7b99.zip
Fix include guards
Macros starting with _ are reserved (see http://www.gnu.org/software/libc/manual/html_node/Reserved-Names.html). Fixes #440.
-rw-r--r--src/config.h6
-rw-r--r--src/libpiano/piano.h6
-rw-r--r--src/libpiano/piano_private.h6
-rw-r--r--src/libwaitress/waitress.h6
-rw-r--r--src/main.h6
-rw-r--r--src/player.h6
-rw-r--r--src/settings.h6
-rw-r--r--src/terminal.h6
-rw-r--r--src/ui.h6
-rw-r--r--src/ui_act.h6
-rw-r--r--src/ui_dispatch.h6
-rw-r--r--src/ui_readline.h6
-rw-r--r--src/ui_types.h6
13 files changed, 39 insertions, 39 deletions
diff --git a/src/config.h b/src/config.h
index 61a75f4..355a910 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,9 +1,9 @@
-#ifndef _CONFIG_H
-#define _CONFIG_H
+#ifndef SRC_CONFIG_H_S6A1C09K
+#define SRC_CONFIG_H_S6A1C09K
/* package name */
#define PACKAGE "pianobar"
#define VERSION "2013.09.15-dev"
-#endif /* _CONFIG_H */
+#endif /* SRC_CONFIG_H_S6A1C09K */
diff --git a/src/libpiano/piano.h b/src/libpiano/piano.h
index e97649e..d8ac4d1 100644
--- a/src/libpiano/piano.h
+++ b/src/libpiano/piano.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _PIANO_H
-#define _PIANO_H
+#ifndef SRC_LIBPIANO_PIANO_H_MFBT13PN
+#define SRC_LIBPIANO_PIANO_H_MFBT13PN
#include <stdbool.h>
#ifdef __FreeBSD__
@@ -346,4 +346,4 @@ PianoStation_t *PianoFindStationById (PianoStation_t * const,
const char * const);
const char *PianoErrorToStr (PianoReturn_t);
-#endif /* _PIANO_H */
+#endif /* SRC_LIBPIANO_PIANO_H_MFBT13PN */
diff --git a/src/libpiano/piano_private.h b/src/libpiano/piano_private.h
index 751f98d..bc0cc0e 100644
--- a/src/libpiano/piano_private.h
+++ b/src/libpiano/piano_private.h
@@ -21,12 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _PIANO_PRIVATE_H
-#define _PIANO_PRIVATE_H
+#ifndef SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL
+#define SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL
#include "piano.h"
void PianoDestroyStation (PianoStation_t *station);
void PianoDestroyUserInfo (PianoUserInfo_t *user);
-#endif /* _PIANO_PRIVATE_H */
+#endif /* SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL */
diff --git a/src/libwaitress/waitress.h b/src/libwaitress/waitress.h
index bd80134..b17d3c1 100644
--- a/src/libwaitress/waitress.h
+++ b/src/libwaitress/waitress.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _WAITRESS_H
-#define _WAITRESS_H
+#ifndef SRC_LIBWAITRESS_WAITRESS_H_ZE5NT8JI
+#define SRC_LIBWAITRESS_WAITRESS_H_ZE5NT8JI
#include <stdlib.h>
#include <unistd.h>
@@ -132,5 +132,5 @@ WaitressReturn_t WaitressFetchBuf (WaitressHandle_t *, char **);
WaitressReturn_t WaitressFetchCall (WaitressHandle_t *);
const char *WaitressErrorToStr (WaitressReturn_t);
-#endif /* _WAITRESS_H */
+#endif /* SRC_LIBWAITRESS_WAITRESS_H_ZE5NT8JI */
diff --git a/src/main.h b/src/main.h
index 04f5203..9567e06 100644
--- a/src/main.h
+++ b/src/main.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _MAIN_H
-#define _MAIN_H
+#ifndef SRC_MAIN_H_4ZGSCG6X
+#define SRC_MAIN_H_4ZGSCG6X
#include <piano.h>
#include <waitress.h>
@@ -45,5 +45,5 @@ typedef struct {
unsigned int playerErrors;
} BarApp_t;
-#endif /* _MAIN_H */
+#endif /* SRC_MAIN_H_4ZGSCG6X */
diff --git a/src/player.h b/src/player.h
index f9e94ef..2c89c93 100644
--- a/src/player.h
+++ b/src/player.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _PLAYER_H
-#define _PLAYER_H
+#ifndef SRC_PLAYER_H_CN979RE9
+#define SRC_PLAYER_H_CN979RE9
#include "config.h"
@@ -72,4 +72,4 @@ void BarPlayerSetVolume (struct audioPlayer * const player);
void BarPlayerInit ();
void BarPlayerDestroy ();
-#endif /* _PLAYER_H */
+#endif /* SRC_PLAYER_H_CN979RE9 */
diff --git a/src/settings.h b/src/settings.h
index aad1fc4..5212d10 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _SETTINGS_H
-#define _SETTINGS_H
+#ifndef SRC_SETTINGS_H_IPL0ON9L
+#define SRC_SETTINGS_H_IPL0ON9L
#include <stdbool.h>
@@ -116,4 +116,4 @@ void BarSettingsRead (BarSettings_t *);
void BarSettingsWrite (PianoStation_t *, BarSettings_t *);
void BarGetXdgConfigDir (const char *, char *, size_t);
-#endif /* _SETTINGS_H */
+#endif /* SRC_SETTINGS_H_IPL0ON9L */
diff --git a/src/terminal.h b/src/terminal.h
index 034699a..4ada438 100644
--- a/src/terminal.h
+++ b/src/terminal.h
@@ -21,12 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _TERMINAL_H
-#define _TERMINAL_H
+#ifndef SRC_TERMINAL_H_WY8F3MNH
+#define SRC_TERMINAL_H_WY8F3MNH
void BarTermSetEcho (char);
void BarTermSetBuffer (char);
void BarTermSave (struct termios *);
void BarTermRestore (struct termios *termOrig);
-#endif /* _TERMINAL_H */
+#endif /* SRC_TERMINAL_H_WY8F3MNH */
diff --git a/src/ui.h b/src/ui.h
index 6b5d891..96ad32f 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _UI_H
-#define _UI_H
+#ifndef SRC_UI_H_46P20TS0
+#define SRC_UI_H_46P20TS0
#include <stdbool.h>
@@ -55,4 +55,4 @@ int BarUiPianoCall (BarApp_t * const, PianoRequestType_t,
void *, PianoReturn_t *, WaitressReturn_t *);
void BarUiHistoryPrepend (BarApp_t *app, PianoSong_t *song);
-#endif /* _UI_H */
+#endif /* SRC_UI_H_46P20TS0 */
diff --git a/src/ui_act.h b/src/ui_act.h
index bd2cf88..a9ce4ee 100644
--- a/src/ui_act.h
+++ b/src/ui_act.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _UI_ACT_H
-#define _UI_ACT_H
+#ifndef SRC_UI_ACT_H_1FEFTC06
+#define SRC_UI_ACT_H_1FEFTC06
#include <piano.h>
@@ -62,4 +62,4 @@ BarUiActCallback(BarUiActVolUp);
BarUiActCallback(BarUiActManageStation);
BarUiActCallback(BarUiActVolReset);
-#endif /* _UI_ACT_H */
+#endif /* SRC_UI_ACT_H_1FEFTC06 */
diff --git a/src/ui_dispatch.h b/src/ui_dispatch.h
index ca8a292..51e5417 100644
--- a/src/ui_dispatch.h
+++ b/src/ui_dispatch.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _UI_DISPATCH_H
-#define _UI_DISPATCH_H
+#ifndef SRC_UI_DISPATCH_H_PV2JON1Z
+#define SRC_UI_DISPATCH_H_PV2JON1Z
/* bit-mask */
typedef enum {
@@ -112,5 +112,5 @@ static const BarUiDispatchAction_t dispatchActions[BAR_KS_COUNT] = {
BarKeyShortcutId_t BarUiDispatch (BarApp_t *, const char, PianoStation_t *, PianoSong_t *,
const bool, BarUiDispatchContext_t);
-#endif /* _UI_DISPATCH_H */
+#endif /* SRC_UI_DISPATCH_H_PV2JON1Z */
diff --git a/src/ui_readline.h b/src/ui_readline.h
index 55411fe..cf8ed52 100644
--- a/src/ui_readline.h
+++ b/src/ui_readline.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _UI_READLINE_H
-#define _UI_READLINE_H
+#ifndef SRC_UI_READLINE_H_IFRX74VM
+#define SRC_UI_READLINE_H_IFRX74VM
#include <stdbool.h>
#include <sys/select.h>
@@ -46,5 +46,5 @@ size_t BarReadlineStr (char *, const size_t,
size_t BarReadlineInt (int *, BarReadlineFds_t *);
bool BarReadlineYesNo (bool, BarReadlineFds_t *);
-#endif /* _UI_READLINE_H */
+#endif /* SRC_UI_READLINE_H_IFRX74VM */
diff --git a/src/ui_types.h b/src/ui_types.h
index c702676..dd3c3f8 100644
--- a/src/ui_types.h
+++ b/src/ui_types.h
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef _UI_TYPES_H
-#define _UI_TYPES_H
+#ifndef SRC_UI_TYPES_H_2HR75RII
+#define SRC_UI_TYPES_H_2HR75RII
typedef enum {
MSG_NONE = 0,
@@ -35,4 +35,4 @@ typedef enum {
MSG_COUNT = 7, /* invalid type */
} BarUiMsg_t;
-#endif /* _UI_TYPES_H */
+#endif /* SRC_UI_TYPES_H_2HR75RII */