[AD] namespace cleanup

[Peter Wang <tjaden@xxxxxxxxxx>]

default_font.diff makes the variable `_default_font' internal to 
src/font.c.  Is there some reason why _default_font was exposed in the 
first place?

virt_voice.diff makes the variable `_voice' internal to src/sound.c.  
Again, was there some reason for it to be exposed?

Finally, win_namespace.diff makes the driver variables 
`timer_win32_high_perf', `timer_win32_low_perf', `keyboard_directx' and 
`mouse_directx' all internal to their own modules.  These should be fine.

Peter

Index: include/allegro/internal/aintern.h
===================================================================
RCS file: /cvsroot/alleg/allegro/include/allegro/internal/aintern.h,v
retrieving revision 1.29
diff -u -r1.29 aintern.h
--- include/allegro/internal/aintern.h	7 Mar 2005 22:55:23 -0000	1.29
+++ include/allegro/internal/aintern.h	13 Mar 2005 06:46:43 -0000
@@ -238,7 +238,6 @@
    AL_METHOD(int, transpose_font, (FONT *f, int drange));
 } FONT_VTABLE;
 
-AL_VAR(FONT, _default_font);
 AL_VAR(FONT_VTABLE, _font_vtable_mono);
 AL_VAR(FONT_VTABLE *, font_vtable_mono);
 AL_VAR(FONT_VTABLE, _font_vtable_color);
Index: src/font.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/font.c,v
retrieving revision 1.12
diff -u -r1.12 font.c
--- src/font.c	14 Feb 2005 17:27:04 -0000	1.12
+++ src/font.c	13 Mar 2005 06:46:47 -0000
@@ -1494,12 +1494,12 @@
     &latin1_monofont            /* next */
 };
 
-FONT _default_font = {
+static FONT default_font = {
     &ascii_monofont,            /* first lot of data */
     8,                          /* height */
     &_font_vtable_mono          /* vtable */
 };
 
-FONT* font = &_default_font;
+FONT* font = &default_font;

Attachment: virt_voice.diff.gz
Description: application/gunzip

Index: include/allegro/platform/alwin.h
===================================================================
RCS file: /cvsroot/alleg/allegro/include/allegro/platform/alwin.h,v
retrieving revision 1.10
diff -u -r1.10 alwin.h
--- include/allegro/platform/alwin.h	21 Aug 2004 11:45:52 -0000	1.10
+++ include/allegro/platform/alwin.h	13 Mar 2005 06:46:43 -0000
@@ -75,9 +75,6 @@
 #define TIMER_WIN32_HIGH_PERF    AL_ID('W','3','2','H')
 #define TIMER_WIN32_LOW_PERF     AL_ID('W','3','2','L')
 
-AL_VAR(TIMER_DRIVER, timer_win32_high_perf);
-AL_VAR(TIMER_DRIVER, timer_win32_low_perf);
-
 
 
 /*******************************************/
@@ -85,8 +82,6 @@
 /*******************************************/
 #define KEYBOARD_DIRECTX         AL_ID('D','X',' ',' ')
 
-AL_VAR(KEYBOARD_DRIVER, keyboard_directx);
-
 
 
 /*******************************************/
@@ -94,8 +89,6 @@
 /*******************************************/
 #define MOUSE_DIRECTX            AL_ID('D','X',' ',' ')
 
-AL_VAR(MOUSE_DRIVER, mouse_directx);
-
 
 
 /*******************************************/
Index: src/win/wkeybd.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wkeybd.c,v
retrieving revision 1.27
diff -u -r1.27 wkeybd.c
--- src/win/wkeybd.c	3 Dec 2004 20:56:27 -0000	1.27
+++ src/win/wkeybd.c	13 Mar 2005 06:46:49 -0000
@@ -32,6 +32,9 @@
 #endif
 
 
+static KEYBOARD_DRIVER keyboard_directx;
+
+
 _DRIVER_INFO _keyboard_driver_list[] =
 {
    {KEYBOARD_DIRECTX, &keyboard_directx, TRUE},
@@ -45,7 +48,7 @@
 static void key_directx_stop_wait(void);
 
 
-KEYBOARD_DRIVER keyboard_directx =
+static KEYBOARD_DRIVER keyboard_directx =
 {
    KEYBOARD_DIRECTX,
    0,
Index: src/win/wmouse.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wmouse.c,v
retrieving revision 1.43
diff -u -r1.43 wmouse.c
--- src/win/wmouse.c	21 Jan 2005 08:33:01 -0000	1.43
+++ src/win/wmouse.c	13 Mar 2005 06:46:50 -0000
@@ -32,6 +32,9 @@
 #endif
 
 
+static MOUSE_DRIVER mouse_directx;
+
+
 _DRIVER_INFO _mouse_driver_list[] =
 {
    {MOUSE_DIRECTX, &mouse_directx, TRUE},
@@ -49,7 +52,7 @@
 static void mouse_directx_enable_hardware_cursor(int mode);
 static int mouse_directx_select_system_cursor(AL_CONST int cursor);
 
-MOUSE_DRIVER mouse_directx =
+static MOUSE_DRIVER mouse_directx =
 {
    MOUSE_DIRECTX,
    empty_string,
Index: src/win/wtimer.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/win/wtimer.c,v
retrieving revision 1.16
diff -u -r1.16 wtimer.c
--- src/win/wtimer.c	27 Jul 2004 10:33:21 -0000	1.16
+++ src/win/wtimer.c	13 Mar 2005 06:46:50 -0000
@@ -36,6 +36,10 @@
 #endif
 
 
+static TIMER_DRIVER timer_win32_high_perf;
+static TIMER_DRIVER timer_win32_low_perf;
+
+
 _DRIVER_INFO _timer_driver_list[] =
 {
    {TIMER_WIN32_HIGH_PERF, &timer_win32_high_perf, TRUE},
@@ -50,7 +54,7 @@
 static void tim_win32_rest(unsigned int time, AL_METHOD(void, callback, (void)));
 
 
-TIMER_DRIVER timer_win32_high_perf =
+static TIMER_DRIVER timer_win32_high_perf =
 {
    TIMER_WIN32_HIGH_PERF,
    empty_string,
@@ -63,7 +67,7 @@
 };
 
 
-TIMER_DRIVER timer_win32_low_perf =
+static TIMER_DRIVER timer_win32_low_perf =
 {
    TIMER_WIN32_LOW_PERF,
    empty_string,