summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2017-03-25 12:30:33 +0100
committerLars-Dominik Braun <lars@6xq.net>2017-03-25 12:30:33 +0100
commit152657501adf3afe9896ac0c118f94d3c7747c8b (patch)
tree9271299efe871a2ae864ad337f0ddbb217b3b5f7
parent43153057c66f4cf1ed6a97671e9aa59e0eacb3bd (diff)
downloadpianobar-152657501adf3afe9896ac0c118f94d3c7747c8b.tar.gz
pianobar-152657501adf3afe9896ac0c118f94d3c7747c8b.tar.bz2
pianobar-152657501adf3afe9896ac0c118f94d3c7747c8b.zip
Switch to #pragma once
-rw-r--r--src/libpiano/crypt.h4
-rw-r--r--src/libpiano/piano.h4
-rw-r--r--src/libpiano/piano_private.h4
-rw-r--r--src/player.h4
-rw-r--r--src/settings.h8
-rw-r--r--src/terminal.h4
-rw-r--r--src/ui.h4
-rw-r--r--src/ui_act.h4
-rw-r--r--src/ui_dispatch.h5
-rw-r--r--src/ui_readline.h5
10 files changed, 12 insertions, 34 deletions
diff --git a/src/libpiano/crypt.h b/src/libpiano/crypt.h
index fc7c205..aac83ca 100644
--- a/src/libpiano/crypt.h
+++ b/src/libpiano/crypt.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_LIBPIANO_CRYPT_H_O832IVGK
-#define SRC_LIBPIANO_CRYPT_H_O832IVGK
+#pragma once
#ifdef __FreeBSD__
#define _GCRYPT_IN_LIBGCRYPT
@@ -33,4 +32,3 @@ char *PianoDecryptString (gcry_cipher_hd_t, const char * const,
size_t * const);
char *PianoEncryptString (gcry_cipher_hd_t, const char *);
-#endif /* SRC_LIBPIANO_CRYPT_H_O832IVGK */
diff --git a/src/libpiano/piano.h b/src/libpiano/piano.h
index 1a84d4a..7f31397 100644
--- a/src/libpiano/piano.h
+++ b/src/libpiano/piano.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_LIBPIANO_PIANO_H_MFBT13PN
-#define SRC_LIBPIANO_PIANO_H_MFBT13PN
+#pragma once
#include "../config.h"
@@ -367,4 +366,3 @@ PianoStation_t *PianoFindStationById (PianoStation_t * const,
const char * const);
const char *PianoErrorToStr (PianoReturn_t);
-#endif /* SRC_LIBPIANO_PIANO_H_MFBT13PN */
diff --git a/src/libpiano/piano_private.h b/src/libpiano/piano_private.h
index bc0cc0e..ffc14c8 100644
--- a/src/libpiano/piano_private.h
+++ b/src/libpiano/piano_private.h
@@ -21,12 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL
-#define SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL
+#pragma once
#include "piano.h"
void PianoDestroyStation (PianoStation_t *station);
void PianoDestroyUserInfo (PianoUserInfo_t *user);
-#endif /* SRC_LIBPIANO_PIANO_PRIVATE_H_C35CDGGL */
diff --git a/src/player.h b/src/player.h
index 97e5e95..0213fde 100644
--- a/src/player.h
+++ b/src/player.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_PLAYER_H_CN979RE9
-#define SRC_PLAYER_H_CN979RE9
+#pragma once
#include "config.h"
@@ -88,4 +87,3 @@ void BarPlayerSetVolume (player_t * const player);
void BarPlayerInit ();
void BarPlayerDestroy ();
-#endif /* SRC_PLAYER_H_CN979RE9 */
diff --git a/src/settings.h b/src/settings.h
index 0403a83..083e610 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_SETTINGS_H_IPL0ON9L
-#define SRC_SETTINGS_H_IPL0ON9L
+#pragma once
#include <stdbool.h>
@@ -76,13 +75,13 @@ typedef enum {
BAR_SORT_COUNT = 6,
} BarStationSorting_t;
-#include "ui_types.h"
-
typedef struct {
char *prefix;
char *postfix;
} BarMsgFormatStr_t;
+#include "ui_types.h"
+
typedef struct {
bool autoselect;
unsigned int history, maxPlayerErrors;
@@ -116,4 +115,3 @@ void BarSettingsDestroy (BarSettings_t *);
void BarSettingsRead (BarSettings_t *);
void BarSettingsWrite (PianoStation_t *, BarSettings_t *);
-#endif /* SRC_SETTINGS_H_IPL0ON9L */
diff --git a/src/terminal.h b/src/terminal.h
index c43d01b..4b4f9c1 100644
--- a/src/terminal.h
+++ b/src/terminal.h
@@ -21,10 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_TERMINAL_H_WY8F3MNH
-#define SRC_TERMINAL_H_WY8F3MNH
+#pragma once
void BarTermInit ();
void BarTermRestore ();
-#endif /* SRC_TERMINAL_H_WY8F3MNH */
diff --git a/src/ui.h b/src/ui.h
index d0fb13a..9901e36 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_UI_H_46P20TS0
-#define SRC_UI_H_46P20TS0
+#pragma once
#include <stdbool.h>
@@ -54,4 +53,3 @@ bool BarUiPianoCall (BarApp_t * const, const PianoRequestType_t,
void *, PianoReturn_t *, CURLcode *);
void BarUiHistoryPrepend (BarApp_t *app, PianoSong_t *song);
-#endif /* SRC_UI_H_46P20TS0 */
diff --git a/src/ui_act.h b/src/ui_act.h
index 676fbb4..fb4457b 100644
--- a/src/ui_act.h
+++ b/src/ui_act.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_UI_ACT_H_1FEFTC06
-#define SRC_UI_ACT_H_1FEFTC06
+#pragma once
#include <piano.h>
@@ -63,4 +62,3 @@ BarUiActCallback(BarUiActManageStation);
BarUiActCallback(BarUiActVolReset);
BarUiActCallback(BarUiActSettings);
-#endif /* SRC_UI_ACT_H_1FEFTC06 */
diff --git a/src/ui_dispatch.h b/src/ui_dispatch.h
index 24b68bb..7e34393 100644
--- a/src/ui_dispatch.h
+++ b/src/ui_dispatch.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_UI_DISPATCH_H_PV2JON1Z
-#define SRC_UI_DISPATCH_H_PV2JON1Z
+#pragma once
/* bit-mask */
typedef enum {
@@ -114,5 +113,3 @@ static const BarUiDispatchAction_t dispatchActions[BAR_KS_COUNT] = {
BarKeyShortcutId_t BarUiDispatch (BarApp_t *, const char, PianoStation_t *, PianoSong_t *,
const bool, BarUiDispatchContext_t);
-#endif /* SRC_UI_DISPATCH_H_PV2JON1Z */
-
diff --git a/src/ui_readline.h b/src/ui_readline.h
index f8221bc..d308d4e 100644
--- a/src/ui_readline.h
+++ b/src/ui_readline.h
@@ -21,8 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-#ifndef SRC_UI_READLINE_H_IFRX74VM
-#define SRC_UI_READLINE_H_IFRX74VM
+#pragma once
#include <stdbool.h>
#include <sys/select.h>
@@ -48,5 +47,3 @@ size_t BarReadlineStr (char *, const size_t,
size_t BarReadlineInt (int *, BarReadlineFds_t *);
bool BarReadlineYesNo (bool, BarReadlineFds_t *);
-#endif /* SRC_UI_READLINE_H_IFRX74VM */
-