Re: [AD] _get_allegro_version (4.3)

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


Attached patch committed. (I didn't rename _install_allegro.)

--
Matthew Leverton
Index: src/allegro.c
===================================================================
--- src/allegro.c	(revision 8119)
+++ src/allegro.c	(working copy)
@@ -231,22 +231,6 @@
 
 
 
-/* _get_allegro_version:
- *  Retrieves the library version.  This is an obsolete definition which should
- *  only be used by Allegro 4.2.0 binaries, which have a call to this function
- *  embedded.
- */
-int _get_allegro_version(void)
-{
-#if ALLEGRO_VERSION == 4 && ALLEGRO_SUB_VERSION == 2
-   return MAKE_VERSION(ALLEGRO_VERSION, ALLEGRO_SUB_VERSION, 0);
-#else
-#error _get_allegro_version should not exist in other versions of Allegro
-#endif
-}
-
-
-
 /* _add_exit_func:
  *  Adds a function to the list that need to be called by allegro_exit().
  *  `desc' should point to a statically allocated string to help with
@@ -309,11 +293,8 @@
 
 /* _install_allegro:
  *  Initialises the Allegro library, activating the system driver.
- *
- *  This is non-static because 4.2.0 binaries reference it.  Newer binaries
- *  should only call this through _install_allegro_version_check().
  */
-int _install_allegro(int system_id, int *errno_ptr, int (*atexit_ptr)(void (*func)(void)))
+static int _install_allegro(int system_id, int *errno_ptr, int (*atexit_ptr)(void (*func)(void)))
 {
    RGB black_rgb = {0, 0, 0, 0};
    char tmp1[64], tmp2[64];
Index: include/allegro/internal/aintern.h
===================================================================
--- include/allegro/internal/aintern.h	(revision 8119)
+++ include/allegro/internal/aintern.h	(working copy)
@@ -40,15 +40,6 @@
 AL_VAR(int, _allegro_in_exit);
 
 
-/* These functions are referenced by 4.2.0 binaries, but should no longer be
- * used by newer versions directly.
- * _get_allegro_version would be marked deprecated except that misc/fixdll.*
- * would complain about it being missing.
- */
-AL_FUNC(int, _get_allegro_version, (void));
-AL_FUNC(int, _install_allegro, (int system_id, int *errno_ptr, AL_METHOD(int, atexit_ptr, (AL_METHOD(void, func, (void))))));
-
-
 /* flag to decide whether to disable the screensaver */
 enum {
   NEVER_DISABLED,


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/