mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-30 16:58:40 -04:00
audio: change include guard naming to be more consistent
Closes #592 Closes #595
This commit is contained in:
parent
073923e5ca
commit
aad1bc9aa2
@ -11,12 +11,12 @@
|
||||
* @date 2000-07-06
|
||||
*/
|
||||
|
||||
#ifndef __AUDIO_H__
|
||||
#define __AUDIO_H__
|
||||
#ifndef AUDIO_H
|
||||
#define AUDIO_H
|
||||
|
||||
#include "filterProperties.h"
|
||||
#include "audioLoadRequest.h"
|
||||
#include "audioSound.h"
|
||||
#include "audioManager.h"
|
||||
|
||||
#endif /* __AUDIO_H__ */
|
||||
#endif /* AUDIO_H */
|
||||
|
@ -12,8 +12,8 @@
|
||||
* Prior system by: cary
|
||||
*/
|
||||
|
||||
#ifndef __AUDIO_MANAGER_H__
|
||||
#define __AUDIO_MANAGER_H__
|
||||
#ifndef AUDIOMANAGER_H
|
||||
#define AUDIOMANAGER_H
|
||||
|
||||
#include "config_audio.h"
|
||||
#include "audioSound.h"
|
||||
@ -222,4 +222,4 @@ operator << (std::ostream &out, const AudioManager &mgr) {
|
||||
|
||||
#include "audioManager.I"
|
||||
|
||||
#endif /* __AUDIO_MANAGER_H__ */
|
||||
#endif /* AUDIOMANAGER_H */
|
||||
|
@ -12,8 +12,8 @@
|
||||
* Prior system by: cary
|
||||
*/
|
||||
|
||||
#ifndef __AUDIOSOUND_H__
|
||||
#define __AUDIOSOUND_H__
|
||||
#ifndef AUDIOSOUND_H
|
||||
#define AUDIOSOUND_H
|
||||
|
||||
#include "config_audio.h"
|
||||
#include "typedReferenceCount.h"
|
||||
@ -160,4 +160,4 @@ operator << (std::ostream &out, const AudioSound &sound) {
|
||||
EXPCL_PANDA_AUDIO std::ostream &
|
||||
operator << (std::ostream &out, AudioSound::SoundStatus status);
|
||||
|
||||
#endif /* __AUDIOSOUND_H__ */
|
||||
#endif /* AUDIOSOUND_H */
|
||||
|
@ -12,8 +12,8 @@
|
||||
* Prior system by: cary
|
||||
*/
|
||||
|
||||
#ifndef __NULL_AUDIO_MANAGER_H__
|
||||
#define __NULL_AUDIO_MANAGER_H__
|
||||
#ifndef NULLAUDIOMANAGER_H
|
||||
#define NULLAUDIOMANAGER_H
|
||||
|
||||
#include "audioManager.h"
|
||||
#include "nullAudioSound.h"
|
||||
@ -89,4 +89,4 @@ private:
|
||||
static TypeHandle _type_handle;
|
||||
};
|
||||
|
||||
#endif /* __NULL_AUDIO_MANAGER_H__ */
|
||||
#endif /* NULLAUDIOMANAGER_H */
|
||||
|
@ -12,8 +12,8 @@
|
||||
* Prior system by: cary
|
||||
*/
|
||||
|
||||
#ifndef __NULL_AUDIO_SOUND_H__
|
||||
#define __NULL_AUDIO_SOUND_H__
|
||||
#ifndef NULLAUDIOSOUND_H
|
||||
#define NULLAUDIOSOUND_H
|
||||
|
||||
#include "audioSound.h"
|
||||
|
||||
@ -91,4 +91,4 @@ private:
|
||||
friend class NullAudioManager;
|
||||
};
|
||||
|
||||
#endif /* __NULL_AUDIO_SOUND_H__ */
|
||||
#endif /* NULLAUDIOSOUND_H */
|
||||
|
Loading…
x
Reference in New Issue
Block a user