[Scummvm-cvs-logs] SF.net SVN: scummvm:[38842] scummvm/trunk/engines/sci
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Feb 24 16:33:41 CET 2009
Revision: 38842
http://scummvm.svn.sourceforge.net/scummvm/?rev=38842&view=rev
Author: sev
Date: 2009-02-24 15:33:40 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
Normalized guard #defines
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/aatree.h
scummvm/trunk/engines/sci/engine/gc.h
scummvm/trunk/engines/sci/engine/heap.h
scummvm/trunk/engines/sci/engine/intmap.h
scummvm/trunk/engines/sci/engine/kdebug.h
scummvm/trunk/engines/sci/engine/kernel.h
scummvm/trunk/engines/sci/engine/kernel_types.h
scummvm/trunk/engines/sci/engine/message.h
scummvm/trunk/engines/sci/engine/sci_graphics.h
scummvm/trunk/engines/sci/engine/seg_manager.h
scummvm/trunk/engines/sci/engine/sys_strings.h
scummvm/trunk/engines/sci/engine/vm.h
scummvm/trunk/engines/sci/exereader.h
scummvm/trunk/engines/sci/gfx/gfx_driver.h
scummvm/trunk/engines/sci/gfx/gfx_operations.h
scummvm/trunk/engines/sci/gfx/gfx_options.h
scummvm/trunk/engines/sci/gfx/gfx_res_options.h
scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
scummvm/trunk/engines/sci/gfx/gfx_resource.h
scummvm/trunk/engines/sci/gfx/gfx_state_internal.h
scummvm/trunk/engines/sci/gfx/gfx_system.h
scummvm/trunk/engines/sci/gfx/gfx_tools.h
scummvm/trunk/engines/sci/gfx/gfx_widgets.h
scummvm/trunk/engines/sci/gfx/menubar.h
scummvm/trunk/engines/sci/gfx/sbtree.h
scummvm/trunk/engines/sci/include/engine.h
scummvm/trunk/engines/sci/include/heapmgr.h
scummvm/trunk/engines/sci/include/sci_midi.h
scummvm/trunk/engines/sci/include/sci_widgets.h
scummvm/trunk/engines/sci/include/sciresource.h
scummvm/trunk/engines/sci/include/script.h
scummvm/trunk/engines/sci/include/uinput.h
scummvm/trunk/engines/sci/include/versions.h
scummvm/trunk/engines/sci/include/vm_types.h
scummvm/trunk/engines/sci/include/vocabulary.h
scummvm/trunk/engines/sci/sci_memory.h
scummvm/trunk/engines/sci/scicore/sciconsole.h
scummvm/trunk/engines/sci/sfx/sfx_core.h
scummvm/trunk/engines/sci/sfx/sfx_engine.h
scummvm/trunk/engines/sci/sfx/sfx_iterator.h
scummvm/trunk/engines/sci/sfx/sfx_iterator_internal.h
scummvm/trunk/engines/sci/sfx/sfx_pcm.h
scummvm/trunk/engines/sci/sfx/sfx_player.h
scummvm/trunk/engines/sci/sfx/sfx_songlib.h
scummvm/trunk/engines/sci/sfx/sfx_time.h
scummvm/trunk/engines/sci/sfx/sfx_timer.h
scummvm/trunk/engines/sci/tools.h
Modified: scummvm/trunk/engines/sci/engine/aatree.h
===================================================================
--- scummvm/trunk/engines/sci/engine/aatree.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/aatree.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_AATREE_H
-#define _SCI_AATREE_H
+#ifndef SCI_ENGINE_AATREE_H
+#define SCI_ENGINE_AATREE_H
namespace Sci {
@@ -84,4 +84,4 @@
} // End of namespace Sci
-#endif // !_SCI_AATREE_H
+#endif // SCI_ENIGNE_AATREE_H
Modified: scummvm/trunk/engines/sci/engine/gc.h
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/gc.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -24,8 +24,8 @@
*/
-#ifndef GC_H_
-#define GC_H_
+#ifndef SCI_ENGINE_GC_H
+#define SCI_ENGINE_GC_H
#include "common/hashmap.h"
#include "sci/include/vm_types.h"
@@ -61,4 +61,4 @@
} // End of namespace Sci
-#endif // !defined(GC_H_)
+#endif // SCI_ENGINE_GC_H
Modified: scummvm/trunk/engines/sci/engine/heap.h
===================================================================
--- scummvm/trunk/engines/sci/engine/heap.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/heap.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_HEAP_H
-#define _SCI_HEAP_H
+#ifndef SCI_ENGINE_HEAP_H
+#define SCI_ENGINE_HEAP_H
#include "sci/tools.h"
@@ -112,4 +112,4 @@
} // End of namespace Sci
-#endif // !_SCI_HEAP_H
+#endif // SCI_ENGINE_HEAP_H
Modified: scummvm/trunk/engines/sci/engine/intmap.h
===================================================================
--- scummvm/trunk/engines/sci/engine/intmap.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/intmap.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef SCI_INTMAP_H
-#define SCI_INTMAP_H
+#ifndef SCI_ENGINE_INTMAP_H
+#define SCI_ENGINE_INTMAP_H
#include "common/scummsys.h"
@@ -92,4 +92,4 @@
} // End of namespace Sci
-#endif // SCI_INTMAP_H
+#endif // SCI_ENGINE_INTMAP_H
Modified: scummvm/trunk/engines/sci/engine/kdebug.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kdebug.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/kdebug.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Kernel debug defines */
-#ifndef _SCI_KDEBUG_H_
-#define _SCI_KDEBUG_H_
+#ifndef SCI_ENGINE_KDEBUG_H
+#define SCI_ENGINE_KDEBUG_H
namespace Sci {
@@ -109,4 +109,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_ENGINE_KDEBUG_H
Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/kernel.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_KERNEL_H_
-#define _SCI_KERNEL_H_
+#ifndef SCI_ENGINE_KERNEL_H
+#define SCI_ENGINE_KERNEL_H
#include "common/scummsys.h"
#include "common/debug.h"
@@ -337,4 +337,4 @@
} // End of namespace Sci
-#endif /* _SCI_KERNEL_H_ */
+#endif // SCI_ENGIENE_KERNEL_H
Modified: scummvm/trunk/engines/sci/engine/kernel_types.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_types.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/kernel_types.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _FREESCI_KERNEL_TYPES_H_
-#define _FREESCI_KERNEL_TYPES_H_
+#ifndef SCI_ENGINE_KERNEL_TYPES_H
+#define SCI_ENGINE_KERNEL_TYPES_H
#include "sci/include/vm_types.h"
@@ -91,4 +91,4 @@
} // End of namespace Sci
-#endif // ! _FREESCI_KERNEL_TYPES_H_
+#endif // SCI_ENGIENE_KERNEL_TYPES_H
Modified: scummvm/trunk/engines/sci/engine/message.h
===================================================================
--- scummvm/trunk/engines/sci/engine/message.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/message.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,6 +23,9 @@
*
*/
+#ifndef SCI_ENGINE_MESSAGE_H
+#define SCI_ENGINE_MESSAGE_H
+
#include "sci/include/sciresource.h"
namespace Sci {
@@ -77,3 +80,5 @@
void message_state_initialize(ResourceManager *resmgr, message_state_t *state);
} // End of namespace Sci
+
+#endif // SCI_ENGINE_MESSAGE_H
Modified: scummvm/trunk/engines/sci/engine/sci_graphics.h
===================================================================
--- scummvm/trunk/engines/sci/engine/sci_graphics.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/sci_graphics.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
// SCI constants and definitions
-#ifndef _SCI_GRAPHICS_H_
-#define _SCI_GRAPHICS_H_
+#ifndef SCI_ENGIEN_SCI_GRAPHICS_H
+#define SCI_ENGINE_SCI_GRAPHICS_H
namespace Sci {
@@ -42,4 +42,4 @@
} // End of namespace Sci
-#endif // !_SCI_GRAPHICS_H_
+#endif // SCI_ENGINE_SCI_GRAPHICS_H
Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_SEG_MANAGER_H
-#define _SCI_SEG_MANAGER_H
+#ifndef SCI_ENGINE_SEG_MANAGER_H
+#define SCI_ENGINE_SEG_MANAGER_H
#include "sci/engine/vm.h"
@@ -500,4 +500,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_ENGINE_SEG_MANAGER
Modified: scummvm/trunk/engines/sci/engine/sys_strings.h
===================================================================
--- scummvm/trunk/engines/sci/engine/sys_strings.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/sys_strings.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef SCI_SYS_STRINGS_H
-#define SCI_SYS_STRINGS_H
+#ifndef SCI_ENGINE_SYS_STRINGS_H
+#define SCI_ENGINE_SYS_STRINGS_H
namespace Sci {
@@ -77,4 +77,4 @@
} // End of namespace Sci
-#endif // SCI_SYS_STRINGS_H
+#endif // SCI_ENGINE_SYS_STRINGS_H
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_VM_H
-#define _SCI_VM_H
+#ifndef SCI_ENGINE_VM_H
+#define SCI_ENGINE_VM_H
/* VM and kernel declarations */
@@ -800,4 +800,4 @@
} // End of namespace Sci
-#endif /* !_SCI_VM_H */
+#endif // SCI_ENGINE_VM_H
Modified: scummvm/trunk/engines/sci/exereader.h
===================================================================
--- scummvm/trunk/engines/sci/exereader.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/exereader.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef EXEREADER_H
-#define EXEREADER_H
+#ifndef SCI_EXEREADER_H
+#define SCI_EXEREADER_H
#include "common/stream.h"
#include "common/util.h"
@@ -37,4 +37,4 @@
} // End of namespace Sci
-#endif // SCI_H
+#endif // SCI_EXEREADER_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_GFX_DRIVER_H_
-#define _SCI_GFX_DRIVER_H_
+#ifndef SCI_GFX_GFX_DRIVER_H
+#define SCI_GFX_GFX_DRIVER_H
#include "sci/gfx/gfx_system.h"
#include "sci/include/uinput.h"
@@ -319,4 +319,4 @@
} // End of namespace Sci
-#endif // !_SCI_GFX_DRIVER_H_
+#endif // SCI_GFX_GFX_DRIVER_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_operations.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_operations.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_operations.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Graphical operations, called from the widget state manager */
-#ifndef _GFX_OPERATIONS_H_
-#define _GFX_OPERATIONS_H_
+#ifndef SCI_GFX_GFX_OPERATIONS_H
+#define SCI_GFX_GFX_OPERATIONS_H
#include "sci/gfx/gfx_resmgr.h"
#include "sci/gfx/gfx_tools.h"
@@ -679,4 +679,4 @@
} // End of namespace Sci
-#endif // !_GFX_OPERATIONS_H_
+#endif // SCI_GFX_GFX_OPERATIONS_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_options.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_options.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_options.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -24,8 +24,8 @@
*/
-#ifndef _GFX_OPTIONS_H_
-#define _GFX_OPTIONS_H_
+#ifndef SCI_GFX_GFX_OPTIONS_H
+#define SCI_GFX_GFX_OPTIONS_H
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
@@ -81,5 +81,4 @@
} // End of namespace Sci
-#endif // !_GFX_OPTIONS_H_
-
+#endif // SCI_GFX_GFX_OPTIONS_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Configuration options for per-resource customisations */
-#ifndef _GFX_RES_OPTIONS_H_
-#define _GFX_RES_OPTIONS_H_
+#ifndef SCI_GFX_GFX_RES_OPTIONS_H
+#define SCI_GFX_GFX_RES_OPTIONS_H
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_resmgr.h"
@@ -106,4 +106,4 @@
} // End of namespace Sci
-#endif /* !_GFX_RES_OPTIONS_H_ */
+#endif // SCI_GFX_GFX_RES_OPTIONS_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _GFX_RESMGR_H_
-#define _GFX_RESMGR_H_
+#ifndef SCI_GFX_GFX_RESMGR_H
+#define SCI_GFX_GFX_RESMGR_H
// FIXME/TODO: The name "(Graphics) resource manager", and the associated
// filenames, are misleading. This should be renamed to "Graphics manager"
@@ -335,4 +335,4 @@
} // End of namespace Sci
-#endif /* !_GFX_RSMGR_H_ */
+#endif // SCI_GFX_GFX_RSMGR_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* SCI Resource library */
-#ifndef _GFX_RESOURCE_H_
-#define _GFX_RESOURCE_H_
+#ifndef SCI_GFX_GFX_RESOURCE_H
+#define SCI_GFX_GFX_RESOURCE_H
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_driver.h"
@@ -407,5 +407,4 @@
} // End of namespace Sci
-#endif /* !_GFX_RESOURCE_H_ */
-
+#endif // SCI_GFX_GFX_RESOURCE_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_state_internal.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_state_internal.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_state_internal.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _GFX_STATE_INTERNAL_H_
-#define _GFX_STATE_INTERNAL_H_
+#ifndef SCI_GFX_GFX_STATE_INTERNAL_H
+#define SCI_GFX_GFX_STATE_INTERNAL_H
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_options.h"
@@ -236,5 +236,4 @@
} // End of namespace Sci
-#endif /* !_GFX_STATE_INTERNAL_H_ */
-
+#endif // SCI_GFX_GFX_STATE_INTERNAL_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_GFX_SYSTEM_
-#define _SCI_GFX_SYSTEM_
+#ifndef SCI_GFX_GFX_SYSTEM
+#define SCI_GFX_GFX_SYSTEM
#include "common/scummsys.h"
#include "common/rect.h"
@@ -389,4 +389,4 @@
} // End of namespace Sci
-#endif /* !_SCI_GFX_SYSTEM_ */
+#endif // SCI_GFX_GFX_SYSTEM
Modified: scummvm/trunk/engines/sci/gfx/gfx_tools.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_tools.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_tools.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -26,8 +26,8 @@
/* FreeSCI 0.3.1+ graphics subsystem helper functions */
-#ifndef _GFX_TOOLS_H_
-#define _GFX_TOOLS_H_
+#ifndef SCI_GFX_GFX_TOOLS_H
+#define SCI_GFX_GFX_TOOLS_H
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_driver.h"
@@ -239,4 +239,4 @@
} // End of namespace Sci
-#endif /* !_GFX_TOOLS_H_ */
+#endif // SCI_GFX_GFX_TOOLS_H
Modified: scummvm/trunk/engines/sci/gfx/gfx_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_widgets.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/gfx_widgets.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Graphical state management */
-#ifndef _GFX_WIDGETS_H_
-#define _GFX_WIDGETS_H_
+#ifndef SCI_GFX_GFX_WIDGETS_H
+#define SCI_GFX_GFX_WIDGETS_H
#include "sci/gfx/gfx_state_internal.h"
@@ -516,4 +516,4 @@
} // End of namespace Sci
-#endif /* !_GFX_WIDGETS_H_ */
+#endif // SCI_GFX_GFX_WIDGETS_H
Modified: scummvm/trunk/engines/sci/gfx/menubar.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/menubar.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/menubar.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Header for SCI0 menu bar management */
-#ifndef _SCI_MENUBAR_H_
-#define _SCI_MENUBAR_H_
+#ifndef SCI_GFX_SCI_MENUBAR_H
+#define SCI_GFX_SCI_MENUBAR_H
#include "sci/include/vm_types.h"
#include "sci/gfx/gfx_operations.h"
@@ -211,5 +211,4 @@
} // End of namespace Sci
-#endif /* !_SCI_MENUBAR_H_ */
-
+#endif // SCI_GFX_SCI_MENUBAR_H
Modified: scummvm/trunk/engines/sci/gfx/sbtree.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/sbtree.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/gfx/sbtree.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -29,8 +29,8 @@
** of resizing after being initialized.
*/
-#ifndef _SBTREE_H_
-#define _SBTREE_H_
+#ifndef SCI_GFX_GFX_SBTREE_H
+#define SCI_GFX_GFX_SBTREE_H
#ifdef SBTREE_DEBUG
# include <stdio.h>
@@ -102,9 +102,4 @@
} // End of namespace Sci
-#endif /* !_SBTREE_H_ */
-
-
-
-
-
+#endif // SCI_GFX_GFX_SBTREE_H
Modified: scummvm/trunk/engines/sci/include/engine.h
===================================================================
--- scummvm/trunk/engines/sci/include/engine.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/engine.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_ENGINE_H
-#define _SCI_ENGINE_H
+#ifndef SCI_INCLUDE_ENGINE_H
+#define SCI_INCLUDE_ENGINE_H
#include "common/scummsys.h"
#include "common/array.h"
@@ -307,4 +307,4 @@
} // End of namespace Sci
-#endif // !_SCI_ENGINE_H
+#endif // SCI_INCLUDE_ENGINE_H
Modified: scummvm/trunk/engines/sci/include/heapmgr.h
===================================================================
--- scummvm/trunk/engines/sci/include/heapmgr.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/heapmgr.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Heap-like managed structure */
-#ifndef _FREESCI_HEAPMGR_H_
-#define _FREESCI_HEAPMGR_H_
+#ifndef SCI_INCLUDE_HEAPMGR_H
+#define SCI_INCLUDE_HEAPMGR_H
#include "sci/tools.h"
#include "sci/sci_memory.h"
@@ -110,4 +110,4 @@
} // End of namespace Sci
-#endif /* !_FREESCI_HEAPMGR_H_ */
+#endif // SCI_INCLUDE_HEAPMGR_H
Modified: scummvm/trunk/engines/sci/include/sci_midi.h
===================================================================
--- scummvm/trunk/engines/sci/include/sci_midi.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/sci_midi.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCI_MIDI_H_
-#define _SCI_MIDI_H_
+#ifndef SCI_INCLUDE_MIDI_H
+#define SCI_INCLUDE_MIDI_H
namespace Sci {
@@ -52,4 +52,4 @@
} // End of namespace Sci
-#endif /* !defined(_SCI_MIDI_H_) */
+#endif // SCI_INCLUDE_MIDI_H
Modified: scummvm/trunk/engines/sci/include/sci_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/include/sci_widgets.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/sci_widgets.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* SCI-specific widget handling */
-#ifndef _SCI_WIDGETS_H_
-#define _SCI_WIDGETS_H_
+#ifndef SCI_INCLUDE_SCI_WIDGETS_H
+#define SCI_INCLUDE_SCI_WIDGETS_H
#include "sci/include/engine.h"
@@ -202,5 +202,4 @@
} // End of namespace Sci
-#endif /* _!SCI_WIDGETS_H_ */
-
+#endif // SCI_INCLUDE_SCI_WIDGETS_H
Modified: scummvm/trunk/engines/sci/include/sciresource.h
===================================================================
--- scummvm/trunk/engines/sci/include/sciresource.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/sciresource.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SCIRESOURCE_H_
-#define _SCIRESOURCE_H_
+#ifndef SCI_INCLUDE_SCIRESOURCE_H
+#define SCI_INCLUDE_SCIRESOURCE_H
#include "common/str.h"
@@ -420,7 +420,4 @@
} // End of namespace Sci
-#endif
-
-
-
+#endif // SCI_INCLUDE_SCIRESOURCE_H
Modified: scummvm/trunk/engines/sci/include/script.h
===================================================================
--- scummvm/trunk/engines/sci/include/script.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/script.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef SCRIPT_H
-#define SCRIPT_H
+#ifndef SCI_INCLUDE_SCRIPT_H
+#define SCI_INCLUDE_SCRIPT_H
#include "sci/include/sciresource.h"
@@ -221,4 +221,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_INCLUDE_SCRIPT_H
Modified: scummvm/trunk/engines/sci/include/uinput.h
===================================================================
--- scummvm/trunk/engines/sci/include/uinput.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/uinput.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* unified input header file */
-#ifndef _SCI_UINPUT_H
-#define _SCI_UINPUT_H
+#ifndef SCI_INCLUDE_UINPUT_H
+#define SCI_INCLUDE_UINPUT_H
namespace Sci {
@@ -124,4 +124,4 @@
} // End of namespace Sci
-#endif /* _SCI_UINPUT_H */
+#endif // SCI_INCLUDE_UINPUT_H
Modified: scummvm/trunk/engines/sci/include/versions.h
===================================================================
--- scummvm/trunk/engines/sci/include/versions.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/versions.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Versions management */
-#ifndef _SCI_VERSIONS_H_
-#define _SCI_VERSIONS_H_
+#ifndef SCI_INCLUDE_VERSIONS_H
+#define SCI_INCLUDE_VERSIONS_H
namespace Sci {
@@ -144,4 +144,4 @@
} // End of namespace Sci
-#endif /* !_SCI_VERSIONS_H_ */
+#endif // SCI_INCLUDE_VERSIONS_H
Modified: scummvm/trunk/engines/sci/include/vm_types.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm_types.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/vm_types.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef SCI_VM_TYPES_H
-#define SCI_VM_TYPES_H
+#ifndef SCI_INCLUDE_VM_TYPES_H
+#define SCI_INCLUDE_VM_TYPES_H
#include "common/scummsys.h"
@@ -61,4 +61,4 @@
} // End of namespace Sci
-#endif // SCI_VM_TYPES_H
+#endif // SCI_INCLUDE_VM_TYPES_H
Modified: scummvm/trunk/engines/sci/include/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/include/vocabulary.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/include/vocabulary.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef SCI_VOCABULARY_H
-#define SCI_VOCABULARY_H
+#ifndef SCI_INCLUDE_VOCABULARY_H
+#define SCI_INCLUDE_VOCABULARY_H
#include "sci/include/versions.h"
#include "sci/include/sciresource.h"
@@ -395,4 +395,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_INCLUDE_VOCABULARY_H
Modified: scummvm/trunk/engines/sci/sci_memory.h
===================================================================
--- scummvm/trunk/engines/sci/sci_memory.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sci_memory.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -40,8 +40,8 @@
**/
-#ifndef _SCI_MEMORY_H
-#define _SCI_MEMORY_H
+#ifndef SCI_SCI_MEMORY_H
+#define SCI_SCI_MEMORY_H
#include "common/scummsys.h"
@@ -138,4 +138,4 @@
} // End of namespace Sci
-#endif /* _SCI_MEMORY_H */
+#endif // SCI_SCI_MEMORY_H
Modified: scummvm/trunk/engines/sci/scicore/sciconsole.h
===================================================================
--- scummvm/trunk/engines/sci/scicore/sciconsole.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/scicore/sciconsole.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -29,8 +29,8 @@
** possible exception of the mouse pointer).
*/
-#ifndef _SCI_CONSOLE_H_
-#define _SCI_CONSOLE_H_
+#ifndef SCI_SCICORE_SCICONSOLE_H
+#define SCI_SCICORE_SCICONSOLE_H
#include "common/scummsys.h"
@@ -227,4 +227,4 @@
} // End of namespace Sci
-#endif /* _SCI_CONSOLE_H_ */
+#endif // SCI_SCICORE_SCICONSOLE_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_core.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_core.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_core.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SFX_CORE_H_
-#define _SFX_CORE_H_
+#ifndef SCI_SFX_SFX_CORE_H
+#define SCI_SFX_SFX_CORE_H
#include "common/scummsys.h"
@@ -37,4 +37,4 @@
} // End of namespace Sci
-#endif /* !defined(_SFX_CORE_H_) */
+#endif // SCI_SFX_SFX_CORE_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_engine.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_engine.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_engine.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -24,8 +24,8 @@
*/
/* Sound engine */
-#ifndef _SFX_ENGINE_H_
-#define _SFX_ENGINE_H_
+#ifndef SCI_SFX_SFX_ENGINE_H
+#define SCI_SFX_SFX_ENGINE_H
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/sfx_songlib.h"
@@ -163,4 +163,4 @@
} // End of namespace Sci
-#endif /* !defined(_SFX_ENGINE_H_) */
+#endif // SCI_SFX_SFX_ENGINE_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_iterator.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_iterator.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_iterator.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Song iterator declarations */
-#ifndef _SCI_SFX_ITERATOR_H_
-#define _SCI_SFX_ITERATOR_H_
+#ifndef SCI_SFX_SFX_ITERATOR_H
+#define SCI_SFX_SFX_ITERATOR_H
#include "sci/sfx/sfx_pcm.h"
@@ -345,4 +345,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_SFX_SFX_ITERATOR_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_iterator_internal.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_iterator_internal.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_iterator_internal.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SFX_ITERATOR_INTERNAL_
-#define _SFX_ITERATOR_INTERNAL_
+#ifndef SCI_SFX_SFX_ITERATOR_INTERNAL
+#define SCI_SFX_SFX_ITERATOR_INTERNAL
#include "sci/sfx/sfx_iterator.h"
#include "sci/include/sci_midi.h"
@@ -231,4 +231,4 @@
} // End of namespace Sci
-#endif /* !defined(_SFX_ITERATOR_INTERNAL_ */
+#endif // SCI_SFX_SFX_ITERATOR_INTERNAL
Modified: scummvm/trunk/engines/sci/sfx/sfx_pcm.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_pcm.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_pcm.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SFX_PCM_H_
-#define _SFX_PCM_H_
+#ifndef SCI_SFX_SFX_PCM_H
+#define SCI_SFX_SFX_PCM_H
#include "sci/sfx/sfx_core.h"
#include "sci/sfx/sfx_timer.h"
@@ -180,4 +180,4 @@
} // End of namespace Sci
-#endif /* !defined(_SFX_PCM_H_) */
+#endif // SCI_SFX_SFX_PCM_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_player.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_player.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_player.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* song player structure */
-#ifndef _SFX_PLAYER_H
-#define _SFX_PLAYER_H
+#ifndef SCI_SFX_SFX_PLAYER_H
+#define SCI_SFX_SFX_PLAYER_H
#include "sci/sfx/sfx_engine.h"
#include "sci/sfx/sfx_iterator.h"
@@ -151,4 +151,4 @@
} // End of namespace Sci
-#endif /* !_SFX_PLAYER_H */
+#endif // SCI_SFX_SFX_PLAYER_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_songlib.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_songlib.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_songlib.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -25,8 +25,8 @@
/* Song library */
-#ifndef _SCI_SFX_SONGLIB_H_
-#define _SCI_SFX_SONGLIB_H_
+#ifndef SCI_SFX_SFX_SONGLIB_H
+#define SCI_SFX_SFX_SONGLIB_H
#include "common/scummsys.h"
@@ -187,4 +187,4 @@
} // End of namespace Sci
-#endif /* !_SCI_SOUND_SERVER_H_ */
+#endif // SCI_SSFX_SFX_SONGLIB_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_time.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_time.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_time.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _SFX_TIME_H_
-#define _SFX_TIME_H_
+#ifndef SCI_SFX_SFX_TIME_H
+#define SCI_SFX_SFX_TIME_H
namespace Sci {
@@ -82,4 +82,4 @@
} // End of namespace Sci
-#endif /* !defined(_SFX_TIME_H_) */
+#endif // SCI_SFX_SFX_TIME_H
Modified: scummvm/trunk/engines/sci/sfx/sfx_timer.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sfx_timer.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/sfx/sfx_timer.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -23,8 +23,8 @@
*
*/
-#ifndef _FREESCI_SFX_TIMER_H_
-#define _FREESCI_SFX_TIMER_H_
+#ifndef SCI_SFX_SFX_TIMER_H
+#define SCI_SFX_SFX_TIMER_H
#include "sci/sfx/sfx_core.h"
@@ -53,4 +53,4 @@
} // End of namespace Sci
-#endif /* !_FREESCI_SFX_TIMER_H_ */
+#endif // SCI_SFX_SFX_TIMER_H
Modified: scummvm/trunk/engines/sci/tools.h
===================================================================
--- scummvm/trunk/engines/sci/tools.h 2009-02-24 15:21:53 UTC (rev 38841)
+++ scummvm/trunk/engines/sci/tools.h 2009-02-24 15:33:40 UTC (rev 38842)
@@ -104,4 +104,4 @@
} // End of namespace Sci
-#endif
+#endif // SCI_TOOLS_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list