From 715be7e1d41ef60811e6f2e33203722b97924c4f Mon Sep 17 00:00:00 2001 From: beveloper Date: Thu, 5 Jun 2003 18:01:00 +0000 Subject: [PATCH] added symbols required by BeOS R5 emu10k.media_addon git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3434 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/media/!missing_symbols.cpp | 18 ++++++++++++++++++ src/kits/media/BufferConsumer.cpp | 7 ------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/kits/media/!missing_symbols.cpp b/src/kits/media/!missing_symbols.cpp index 18f44d4e07..fc2a5bd079 100644 --- a/src/kits/media/!missing_symbols.cpp +++ b/src/kits/media/!missing_symbols.cpp @@ -7,6 +7,24 @@ #include #include "debug.h" +/* According to the normal headers, these symbols should neither be + * included in libmedia.so, nor used by anything. + * But BeOS R5 has them, and they are required to load the BeOS R5 + * emu10k.media_addon, that might have been compiled with strange headers. + * They should be removed once the emu10k.media_addon is no longer used. + */ +extern "C" void Connect__15BBufferProducerlRC12media_sourceRC17media_destinationRC12media_formatPc(void *); +extern "C" status_t Connected__15BBufferConsumerRC12media_sourceRC17media_destinationRC12media_formatP11media_input(void *); + +void Connect__15BBufferProducerlRC12media_sourceRC17media_destinationRC12media_formatPc(void *) +{ +} + +status_t Connected__15BBufferConsumerRC12media_sourceRC17media_destinationRC12media_formatP11media_input(void *) +{ + return B_OK; +} + /* used by libgame.so diff --git a/src/kits/media/BufferConsumer.cpp b/src/kits/media/BufferConsumer.cpp index d187dc14b1..4f11103f57 100644 --- a/src/kits/media/BufferConsumer.cpp +++ b/src/kits/media/BufferConsumer.cpp @@ -596,10 +596,3 @@ status_t BBufferConsumer::_Reserved_BufferConsumer_13(void *) { return B_ERROR; status_t BBufferConsumer::_Reserved_BufferConsumer_14(void *) { return B_ERROR; } status_t BBufferConsumer::_Reserved_BufferConsumer_15(void *) { return B_ERROR; } - -extern "C" status_t Connected__15BBufferConsumerRC12media_sourceRC17media_destinationRC12media_formatP11media_input(void *); - -status_t Connected__15BBufferConsumerRC12media_sourceRC17media_destinationRC12media_formatP11media_input(void *) -{ - return B_OK; -}