# HG changeset patch # User diego # Date 1266434488 0 # Node ID 2b9abdf8f6bfba04af6e4c19bb1931e50d44d0ae # Parent 007b3397591fdb2909c0f812805f194f1a2f1ed1 Revert marking seemingly unused RealAudio/RealVideo-related functions as static. The functions are required to load binary Real codecs, so they need to be kept. Group all functions together in ad_realaud.c because all the functions are used to load audio binaries and only some to load video binaries. diff -r 007b3397591f -r 2b9abdf8f6bf libmpcodecs/ad_realaud.c --- a/libmpcodecs/ad_realaud.c Wed Feb 17 07:06:12 2010 +0000 +++ b/libmpcodecs/ad_realaud.c Wed Feb 17 19:21:28 2010 +0000 @@ -41,18 +41,46 @@ LIBAD_EXTERN(realaud) -static void *__builtin_new(unsigned long size) +/* These functions are required for loading Real binary libs. + * Add forward declarations to avoid warnings with -Wmissing-prototypes. */ +void *__builtin_new(unsigned long size); +void __builtin_delete(void *ize); +void *__builtin_vec_new(unsigned long size); +void __builtin_vec_delete(void *mem); +void __pure_virtual(void); + +void *__builtin_new(unsigned long size) { return malloc(size); } -// required for cook's uninit: -static void __builtin_delete(void* ize) +void __builtin_delete(void* ize) { free(ize); } +void *__builtin_vec_new(unsigned long size) +{ + return malloc(size); +} + +void __builtin_vec_delete(void *mem) +{ + free(mem); +} + +void __pure_virtual(void) +{ + printf("FATAL: __pure_virtual() called!\n"); +// exit(1); +} + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +void ___brk_addr(void); +void ___brk_addr(void) {exit(0);} +char **__environ={NULL}; +#undef stderr +FILE *stderr=NULL; void *__ctype_b=NULL; #endif diff -r 007b3397591f -r 2b9abdf8f6bf libmpcodecs/vd_realvid.c --- a/libmpcodecs/vd_realvid.c Wed Feb 17 07:06:12 2010 +0000 +++ b/libmpcodecs/vd_realvid.c Wed Feb 17 19:21:28 2010 +0000 @@ -84,29 +84,6 @@ static int dll_type = 0; /* 0 = unix dlopen, 1 = win32 dll */ #endif -static void *__builtin_vec_new(unsigned long size) -{ - return malloc(size); -} - -static void __builtin_vec_delete(void *mem) -{ - free(mem); -} - -static void __pure_virtual(void) -{ - printf("FATAL: __pure_virtual() called!\n"); -// exit(1); -} - -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -void ___brk_addr(void) {exit(0);} -char **__environ={NULL}; -#undef stderr -FILE *stderr=NULL; -#endif - // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ // switch(cmd){