Skip to content

Commit aad1bc9

Browse files
FReeshabhrdb
authored andcommitted
audio: change include guard naming to be more consistent
Closes panda3d#592 Closes panda3d#595
1 parent 073923e commit aad1bc9

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

panda/src/audio/audio.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* @date 2000-07-06
1212
*/
1313

14-
#ifndef __AUDIO_H__
15-
#define __AUDIO_H__
14+
#ifndef AUDIO_H
15+
#define AUDIO_H
1616

1717
#include "filterProperties.h"
1818
#include "audioLoadRequest.h"
1919
#include "audioSound.h"
2020
#include "audioManager.h"
2121

22-
#endif /* __AUDIO_H__ */
22+
#endif /* AUDIO_H */

panda/src/audio/audioManager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Prior system by: cary
1313
*/
1414

15-
#ifndef __AUDIO_MANAGER_H__
16-
#define __AUDIO_MANAGER_H__
15+
#ifndef AUDIOMANAGER_H
16+
#define AUDIOMANAGER_H
1717

1818
#include "config_audio.h"
1919
#include "audioSound.h"
@@ -222,4 +222,4 @@ operator << (std::ostream &out, const AudioManager &mgr) {
222222

223223
#include "audioManager.I"
224224

225-
#endif /* __AUDIO_MANAGER_H__ */
225+
#endif /* AUDIOMANAGER_H */

panda/src/audio/audioSound.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Prior system by: cary
1313
*/
1414

15-
#ifndef __AUDIOSOUND_H__
16-
#define __AUDIOSOUND_H__
15+
#ifndef AUDIOSOUND_H
16+
#define AUDIOSOUND_H
1717

1818
#include "config_audio.h"
1919
#include "typedReferenceCount.h"
@@ -160,4 +160,4 @@ operator << (std::ostream &out, const AudioSound &sound) {
160160
EXPCL_PANDA_AUDIO std::ostream &
161161
operator << (std::ostream &out, AudioSound::SoundStatus status);
162162

163-
#endif /* __AUDIOSOUND_H__ */
163+
#endif /* AUDIOSOUND_H */

panda/src/audio/nullAudioManager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Prior system by: cary
1313
*/
1414

15-
#ifndef __NULL_AUDIO_MANAGER_H__
16-
#define __NULL_AUDIO_MANAGER_H__
15+
#ifndef NULLAUDIOMANAGER_H
16+
#define NULLAUDIOMANAGER_H
1717

1818
#include "audioManager.h"
1919
#include "nullAudioSound.h"
@@ -89,4 +89,4 @@ class EXPCL_PANDA_AUDIO NullAudioManager : public AudioManager {
8989
static TypeHandle _type_handle;
9090
};
9191

92-
#endif /* __NULL_AUDIO_MANAGER_H__ */
92+
#endif /* NULLAUDIOMANAGER_H */

panda/src/audio/nullAudioSound.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Prior system by: cary
1313
*/
1414

15-
#ifndef __NULL_AUDIO_SOUND_H__
16-
#define __NULL_AUDIO_SOUND_H__
15+
#ifndef NULLAUDIOSOUND_H
16+
#define NULLAUDIOSOUND_H
1717

1818
#include "audioSound.h"
1919

@@ -91,4 +91,4 @@ class EXPCL_PANDA_AUDIO NullAudioSound : public AudioSound {
9191
friend class NullAudioManager;
9292
};
9393

94-
#endif /* __NULL_AUDIO_SOUND_H__ */
94+
#endif /* NULLAUDIOSOUND_H */

0 commit comments

Comments
 (0)