[Scummvm-cvs-logs] SF.net SVN: scummvm:[41605] scummvm/branches/gsoc2009-draci/engines/draci

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Jun 17 07:18:49 CEST 2009


Revision: 41605
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41605&view=rev
Author:   sev
Date:     2009-06-17 05:18:48 +0000 (Wed, 17 Jun 2009)

Log Message:
-----------
Added prefices to safeguard defines in order to minimize risk of name clash.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/barchive.h
    scummvm/branches/gsoc2009-draci/engines/draci/font.h
    scummvm/branches/gsoc2009-draci/engines/draci/gpldisasm.h
    scummvm/branches/gsoc2009-draci/engines/draci/screen.h
    scummvm/branches/gsoc2009-draci/engines/draci/sprite.h

Modified: scummvm/branches/gsoc2009-draci/engines/draci/barchive.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/barchive.h	2009-06-17 04:48:48 UTC (rev 41604)
+++ scummvm/branches/gsoc2009-draci/engines/draci/barchive.h	2009-06-17 05:18:48 UTC (rev 41605)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BARCHIVE_H
-#define BARCHIVE_H
+#ifndef DRACI_BARCHIVE_H
+#define DRACI_BARCHIVE_H
 
 #include "common/str.h"
 
@@ -94,4 +94,4 @@
 
 } // End of namespace Draci
 
-#endif // BARCHIVE_H
+#endif // DRACI_BARCHIVE_H

Modified: scummvm/branches/gsoc2009-draci/engines/draci/font.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/font.h	2009-06-17 04:48:48 UTC (rev 41604)
+++ scummvm/branches/gsoc2009-draci/engines/draci/font.h	2009-06-17 05:18:48 UTC (rev 41605)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef FONT_H
-#define FONT_H
+#ifndef DRACI_FONT_H
+#define DRACI_FONT_H
 
 #include "graphics/font.h"
 
@@ -83,4 +83,4 @@
 
 } // End of namespace Draci
 
-#endif // FONT_H
+#endif // DRACI_FONT_H

Modified: scummvm/branches/gsoc2009-draci/engines/draci/gpldisasm.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/gpldisasm.h	2009-06-17 04:48:48 UTC (rev 41604)
+++ scummvm/branches/gsoc2009-draci/engines/draci/gpldisasm.h	2009-06-17 05:18:48 UTC (rev 41605)
@@ -25,8 +25,8 @@
 
 #include "common/str.h"
 
-#ifndef GPLDISASM_H
-#define GPLDISASM_H
+#ifndef DRACI_GPLDISASM_H
+#define DRACI_GPLDISASM_H
 
 namespace Draci {
 
@@ -53,4 +53,4 @@
 
 }
 
-#endif // GPLDIASM_H
+#endif // DRACI_GPLDIASM_H

Modified: scummvm/branches/gsoc2009-draci/engines/draci/screen.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/screen.h	2009-06-17 04:48:48 UTC (rev 41604)
+++ scummvm/branches/gsoc2009-draci/engines/draci/screen.h	2009-06-17 05:18:48 UTC (rev 41605)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCREEN_H
-#define SCREEN_H
+#ifndef DRACI_SCREEN_H
+#define DRACI_SCREEN_H
 
 #include "graphics/surface.h"
 
@@ -57,4 +57,4 @@
 
 } // End of namespace Draci
 
-#endif // SCREEN_H
+#endif // DRACI_SCREEN_H

Modified: scummvm/branches/gsoc2009-draci/engines/draci/sprite.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/sprite.h	2009-06-17 04:48:48 UTC (rev 41604)
+++ scummvm/branches/gsoc2009-draci/engines/draci/sprite.h	2009-06-17 05:18:48 UTC (rev 41605)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SPRITE_H
-#define SPRITE_H
+#ifndef DRACI_SPRITE_H
+#define DRACI_SPRITE_H
 
 namespace Draci {
 
@@ -61,4 +61,4 @@
 
 } // End of namespace Draci
 
-#endif // SPRITE_H
+#endif // DRACI_SPRITE_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