diff options
| author | Johannes Schickel | 2011-10-28 12:23:01 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-10-28 12:23:50 +0200 |
| commit | 0e8110d3dbcb8d9ef6d0b9e3969ec4f13ea22990 (patch) | |
| tree | 023086b1ca30e0071b192349591e937526cb4062 /audio | |
| parent | dc649a13a7ed1721160140298aa4f1c9fd4b65d9 (diff) | |
| download | scummvm-rg350-0e8110d3dbcb8d9ef6d0b9e3969ec4f13ea22990.tar.gz scummvm-rg350-0e8110d3dbcb8d9ef6d0b9e3969ec4f13ea22990.tar.bz2 scummvm-rg350-0e8110d3dbcb8d9ef6d0b9e3969ec4f13ea22990.zip | |
AUDIO: Slight adaptions of SID code to our guidelines.
This only touches #include usages and the include guard of sid.h.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/softsynth/sid.cpp | 2 | ||||
| -rw-r--r-- | audio/softsynth/sid.h | 6 | ||||
| -rw-r--r-- | audio/softsynth/wave6581.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/audio/softsynth/sid.cpp b/audio/softsynth/sid.cpp index 4b8f783ef4..1ad822b86a 100644 --- a/audio/softsynth/sid.cpp +++ b/audio/softsynth/sid.cpp @@ -27,7 +27,7 @@ #ifndef DISABLE_SID -#include "sid.h" +#include "audio/softsynth/sid.h" #include "audio/null.h" namespace Resid { diff --git a/audio/softsynth/sid.h b/audio/softsynth/sid.h index a015242844..19577e94d1 100644 --- a/audio/softsynth/sid.h +++ b/audio/softsynth/sid.h @@ -25,8 +25,8 @@ * Copyright (C) 2004 Dag Lem <resid@nimrod.no> */ -#ifndef __SID_H__ -#define __SID_H__ +#ifndef AUDIO_SOFTSYNTH_SID_H +#define AUDIO_SOFTSYNTH_SID_H // Inlining on/off. #define RESID_INLINE inline @@ -342,4 +342,4 @@ protected: } -#endif // not __SID_H__ +#endif // not AUDIO_SOFTSYNTH_SID_H diff --git a/audio/softsynth/wave6581.cpp b/audio/softsynth/wave6581.cpp index 63e08fb113..832a7272ff 100644 --- a/audio/softsynth/wave6581.cpp +++ b/audio/softsynth/wave6581.cpp @@ -27,7 +27,7 @@ #ifndef DISABLE_SID -#include "sid.h" +#include "audio/softsynth/sid.h" namespace Resid { |