No subject


Fri Aug 26 12:11:03 CEST 2016


so I've removed most of them. There's still some in list.h, but that should
probably be replaced by our own list handler some day.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/console.h
    scummvm/trunk/engines/agi/graphics.h
    scummvm/trunk/engines/agi/keyboard.h
    scummvm/trunk/engines/agi/list.h
    scummvm/trunk/engines/agi/logic.h
    scummvm/trunk/engines/agi/lzw.h
    scummvm/trunk/engines/agi/menu.h
    scummvm/trunk/engines/agi/opcodes.h
    scummvm/trunk/engines/agi/picture.h
    scummvm/trunk/engines/agi/savegame.h
    scummvm/trunk/engines/agi/sound.h
    scummvm/trunk/engines/agi/sprite.h
    scummvm/trunk/engines/agi/text.h
    scummvm/trunk/engines/agi/view.h
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/agi.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_H
-#define __AGI_H
+#ifndef AGI_H
+#define AGI_H
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
@@ -42,7 +42,6 @@
 /*
  * Version and other definitions
  */
-#define INLINE __inline
 #define VERSION __DATE__ " " __TIME__
 
 #define USE_CONSOLE
@@ -523,4 +522,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_H */
+#endif				/* AGI_H */

Modified: scummvm/trunk/engines/agi/console.h
===================================================================
--- scummvm/trunk/engines/agi/console.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/console.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_CONSOLE_H
-#define __AGI_CONSOLE_H
+#ifndef AGI_CONSOLE_H
+#define AGI_CONSOLE_H
 
 namespace Agi {
 
@@ -68,4 +68,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_CONSOLE_H */
+#endif				/* AGI_CONSOLE_H */

Modified: scummvm/trunk/engines/agi/graphics.h
===================================================================
--- scummvm/trunk/engines/agi/graphics.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/graphics.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_GRAPHICS_H
-#define __AGI_GRAPHICS_H
+#ifndef AGI_GRAPHICS_H
+#define AGI_GRAPHICS_H
 
 #include "common/stdafx.h"
 
@@ -80,4 +80,4 @@
 
 } // End of namespace Agi
 
-#endif				/* __AGI_GRAPHICS_H */
+#endif				/* AGI_GRAPHICS_H */

Modified: scummvm/trunk/engines/agi/keyboard.h
===================================================================
--- scummvm/trunk/engines/agi/keyboard.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/keyboard.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_KEYBOARD_H
-#define __AGI_KEYBOARD_H
+#ifndef AGI_KEYBOARD_H
+#define AGI_KEYBOARD_H
 
 #include "common/stdafx.h"
 
@@ -89,4 +89,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_KEYBOARD_H */
+#endif				/* AGI_KEYBOARD_H */

Modified: scummvm/trunk/engines/agi/list.h
===================================================================
--- scummvm/trunk/engines/agi/list.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/list.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -4,8 +4,8 @@
  * List management macros from the Linux kernel
  */
 
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
+#ifndef AGI_IST_H
+#define AGI_LIST_H
 
 #include "agi/agi.h"
 
@@ -40,7 +40,7 @@
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static INLINE void __list_add(struct list_head *tnew, struct list_head *prev, struct list_head *next) {
+static FORCEINLINE void __list_add(struct list_head *tnew, struct list_head *prev, struct list_head *next) {
 	next->prev = tnew;
 	tnew->next = next;
 	tnew->prev = prev;
@@ -55,7 +55,7 @@
  * @param new new entry to be added
  * @param head list head to add it after
  */
-static INLINE void list_add(struct list_head *tnew, struct list_head *head) {
+static FORCEINLINE void list_add(struct list_head *tnew, struct list_head *head) {
 	__list_add(tnew, head, head->next);
 }
 
@@ -67,7 +67,7 @@
  * @new: new entry to be added
  * @head: list head to add it before
  */
-static INLINE void list_add_tail(struct list_head *tnew, struct list_head *head) {
+static FORCEINLINE void list_add_tail(struct list_head *tnew, struct list_head *head) {
 	__list_add(tnew, head->prev, head);
 }
 
@@ -77,7 +77,7 @@
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static INLINE void __list_del(struct list_head *prev, struct list_head *next) {
+static FORCEINLINE void __list_del(struct list_head *prev, struct list_head *next) {
 	next->prev = prev;
 	prev->next = next;
 }
@@ -86,7 +86,7 @@
  * deletes entry from list.
  * @param entry the element to delete from the list.
  */
-static INLINE void list_del(struct list_head *entry) {
+static FORCEINLINE void list_del(struct list_head *entry) {
 	__list_del(entry->prev, entry->next);
 }
 
@@ -94,7 +94,7 @@
  * tests whether a list is empty
  * @param head the list to test.
  */
-static INLINE int list_empty(struct list_head *head) {
+static FORCEINLINE int list_empty(struct list_head *head) {
 	return head->next == head;
 }
 
@@ -103,7 +103,7 @@
  * @param list the new list to add.
  * @param head the place to add it in the first list.
  */
-static INLINE void list_splice(struct list_head *list, struct list_head *head) {
+static FORCEINLINE void list_splice(struct list_head *list, struct list_head *head) {
 	struct list_head *first = list->next;
 
 	if (first != list) {
@@ -137,4 +137,4 @@
 
 }                             // End of namespace Agi
 
-#endif
+#endif				/* AGI_LIST_H */

Modified: scummvm/trunk/engines/agi/logic.h
===================================================================
--- scummvm/trunk/engines/agi/logic.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/logic.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_LOGIC_H
-#define __AGI_LOGIC_H
+#ifndef AGI_LOGIC_H
+#define AGI_LOGIC_H
 
 #include "agi/agi.h"
 
@@ -46,4 +46,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_LOGIC_H */
+#endif				/* AGI_LOGIC_H */

Modified: scummvm/trunk/engines/agi/lzw.h
===================================================================
--- scummvm/trunk/engines/agi/lzw.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/lzw.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,12 +22,13 @@
  *
  */
 
-#ifndef __AGI_LZW_H
-#define __AGI_LZW_H
+#ifndef AGI_LZW_H
+#define AGI_LZW_H
 
 namespace Agi {
 
 void LZW_expand(uint8 *, uint8 *, int32);
 
 }				// End of namespace Agi
-#endif
+
+#endif				/* AGI_LZW_H */

Modified: scummvm/trunk/engines/agi/menu.h
===================================================================
--- scummvm/trunk/engines/agi/menu.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/menu.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_MENU_H
-#define __AGI_MENU_H
+#ifndef AGI_MENU_H
+#define AGI_MENU_H
 
 namespace Agi {
 
@@ -43,4 +43,5 @@
 void menu_enable_all(void);
 
 }                             // End of namespace Agi
-#endif
+
+#endif				/* AGI_MENU_H */

Modified: scummvm/trunk/engines/agi/opcodes.h
===================================================================
--- scummvm/trunk/engines/agi/opcodes.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/opcodes.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_OPCODES_H
-#define __AGI_OPCODES_H
+#ifndef AGI_OPCODES_H
+#define AGI_OPCODES_H
 
 #include "agi/agi.h"
 
@@ -52,4 +52,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_OPCODES_H */
+#endif				/* AGI_OPCODES_H */

Modified: scummvm/trunk/engines/agi/picture.h
===================================================================
--- scummvm/trunk/engines/agi/picture.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/picture.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_PICTURE_H
-#define __AGI_PICTURE_H
+#ifndef AGI_PICTURE_H
+#define AGI_PICTURE_H
 
 #include "agi/agi.h"
 
@@ -44,4 +44,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_PICTURE_H */
+#endif				/* AGI_PICTURE_H */

Modified: scummvm/trunk/engines/agi/savegame.h
===================================================================
--- scummvm/trunk/engines/agi/savegame.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/savegame.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_SAVEGAME_H
-#define __AGI_SAVEGAME_H
+#ifndef AGI_SAVEGAME_H
+#define AGI_SAVEGAME_H
 
 #include "agi/agi.h"
 
@@ -47,4 +47,4 @@
 
 }                             // End of namespace Agi
 
-#endif
+#endif				/* AGI_SAVEGAME_H */

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/sound.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_SOUND_H
-#define __AGI_SOUND_H
+#ifndef AGI_SOUND_H
+#define AGI_SOUND_H
 
 #include "agi/agi.h"
 
@@ -110,12 +110,11 @@
 void start_sound(int, int);
 void stop_sound(void);
 uint32 mix_sound(void);
-void __init_sound(void);
 int load_instruments(char *fname);
 
 extern struct sound_driver *snd;
 
-#endif				/* __AGI_SOUND_H */
+#endif				/* AGI_SOUND_H */
 
 } // End of namespace Agi
 

Modified: scummvm/trunk/engines/agi/sprite.h
===================================================================
--- scummvm/trunk/engines/agi/sprite.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/sprite.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_SPRITE_H
-#define __AGI_SPRITE_H
+#ifndef AGI_SPRITE_H
+#define AGI_SPRITE_H
 
 namespace Agi {
 
@@ -44,4 +44,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_SPRITE_H */
+#endif				/* AGI_SPRITE_H */

Modified: scummvm/trunk/engines/agi/text.h
===================================================================
--- scummvm/trunk/engines/agi/text.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/text.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_TEXT_H
-#define __AGI_TEXT_H
+#ifndef AGI_TEXT_H
+#define AGI_TEXT_H
 
 #include "agi/agi.h"
 
@@ -45,4 +45,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_TEXT_H */
+#endif				/* AGI_TEXT_H */

Modified: scummvm/trunk/engines/agi/view.h
===================================================================
--- scummvm/trunk/engines/agi/view.h	2006-05-24 14:18:45 UTC (rev 22610)
+++ scummvm/trunk/engines/agi/view.h	2006-05-24 14:25:42 UTC (rev 22611)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __AGI_VIEW_H
-#define __AGI_VIEW_H
+#ifndef AGI_VIEW_H
+#define AGI_VIEW_H
 
 namespace Agi {
 
@@ -139,4 +139,4 @@
 
 }                             // End of namespace Agi
 
-#endif				/* __AGI_VIEW_H */
+#endif				/* AGI_VIEW_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