CVS: allegro_new/include/allegro/internal aintern.h,1.1.1.1,1.2 aintvga.h,1.1.1.1,1.2 alconfig.h,1.1.1.1,1.2

[Grzegorz A. H. <gr...@us...>]

Update of /cvsroot/alleg/allegro_new/include/allegro/internal
In directory usw-pr-cvs1:/tmp/cvs-serv15595/include/allegro/internal

Modified Files:
	aintern.h aintvga.h alconfig.h 
Log Message:
Initial prefixed compilable version

Index: aintern.h
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/internal/aintern.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- aintern.h	2002/01/18 16:32:33	1.1.1.1
+++ aintern.h	2002/01/20 17:34:09	1.2
@@ -91,7 +91,7 @@
 AL_VAR(int, _packfile_filesize);
 AL_VAR(int, _packfile_datasize);
 AL_VAR(int, _packfile_type);
-AL_FUNC(PACKFILE *, _pack_fdopen, (int fd, AL_CONST char *mode));
+AL_FUNC(AL_PACKFILE *, _pack_fdopen, (int fd, AL_CONST char *mode));
 
 
 /* various bits of mouse stuff */
@@ -106,8 +106,8 @@
 AL_VAR(int, _mouse_installed);
 
[...658 lines suppressed...]
+AL_ARRAY(AL_DATAFILE_TYPE, _datafile_type);
 
 AL_VAR(int, _compile_sprites);
 
-AL_FUNC(void, _construct_datafile, (DATAFILE *data));
+AL_FUNC(void, _construct_datafile, (AL_DATAFILE *data));
 
 
 /* for readbmp.c */
@@ -1116,8 +1116,8 @@
 struct _AL_LINKER_MOUSE
 {
    AL_METHOD(void, set_mouse_etc, (void));
-   AL_METHOD(void, show_mouse, (BITMAP *));
-   BITMAP **mouse_screen_ptr;
+   AL_METHOD(void, al_show_mouse, (AL_BITMAP *));
+   AL_BITMAP **mouse_screen_ptr;
 };
 
 AL_VAR(struct _AL_LINKER_MOUSE *, _al_linker_mouse);

Index: aintvga.h
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/internal/aintvga.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- aintvga.h	2002/01/18 16:32:33	1.1.1.1
+++ aintvga.h	2002/01/20 17:34:09	1.2
@@ -32,7 +32,7 @@
 
 AL_FUNC(void, _vga_regs_init, (void));
 AL_FUNC(void, _vga_vsync, (void));
-AL_FUNC(void, _vga_set_palette_range, (AL_CONST PALETTE p, int from, int to, int sync));
+AL_FUNC(void, _vga_set_palette_range, (AL_CONST AL_PALETTE p, int from, int to, int sync));
 AL_FUNC(void, _set_vga_virtual_width, (int old_width, int new_width));
 AL_FUNC(unsigned long, _set_vga_mode, (int modenum));
 AL_FUNC(void, _unset_vga_mode, (void));
@@ -97,10 +97,10 @@
 AL_INLINE(void, _vsync_in, (void),
 {
    if (_timer_use_retrace) {
-      int t = retrace_count; 
+      int t = al_retrace_count; 
 
       do {
-      } while (t == retrace_count);
+      } while (t == al_retrace_count);
    }
    else {
       do {

Index: alconfig.h
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/internal/alconfig.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- alconfig.h	2002/01/18 16:32:25	1.1.1.1
+++ alconfig.h	2002/01/20 17:34:09	1.2
@@ -117,7 +117,7 @@
    #define DESTRUCTOR_FUNCTION(func)               func __attribute__ ((destructor))
 #endif
 
-/* the rest of this file fills in some default definitions of language
+/* the al_rest of this file fills in some default definitions of language
  * features and helper functions, which are conditionalised so they will
  * only be included if none of the above headers defined custom versions.
  */
@@ -166,15 +166,15 @@
    #define AL_INLINE(type, name, args, code)       type name args;
 #endif
 
-#ifndef END_OF_MAIN
-   #define END_OF_MAIN()
+#ifndef AL_END_OF_MAIN
+   #define AL_END_OF_MAIN()
 #endif
 
 
 /* fill in default memory locking macros */
-#ifndef END_OF_FUNCTION
-   #define END_OF_FUNCTION(x)
-   #define END_OF_STATIC_FUNCTION(x)
+#ifndef AL_END_OF_FUNCTION
+   #define AL_END_OF_FUNCTION(x)
+   #define AL_END_OF_STATIC_FUNCTION(x)
    #define LOCK_DATA(d, s)
    #define LOCK_CODE(c, s)
    #define UNLOCK_DATA(d, s)