[libdvdcss-devel] [PATCH 5/7] os/2: Avoid silly macro indirection for function pointer initialization

Diego Biurrun diego at biurrun.de
Sun Nov 16 20:37:12 CET 2014


---
 src/device.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/device.c b/src/device.c
index 8744810..da4ecc4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -87,10 +87,6 @@ static int win2k_readv ( dvdcss_t, const struct iovec *, int );
 
 #elif defined( __OS2__ )
 static int os2_open ( dvdcss_t, const char * );
-/* just use macros for libc */
-#   define os2_seek     libc_seek
-#   define os2_read     libc_read
-#   define os2_readv    libc_readv
 #endif
 
 int dvdcss_use_ioctls( dvdcss_t dvdcss )
@@ -366,9 +362,9 @@ int dvdcss_open_device ( dvdcss_t dvdcss )
         return win2k_open( dvdcss, psz_device );
 #elif defined( __OS2__ )
         print_debug( dvdcss, "using OS/2 API for access" );
-        dvdcss->pf_seek  = os2_seek;
-        dvdcss->pf_read  = os2_read;
-        dvdcss->pf_readv = os2_readv;
+        dvdcss->pf_seek  = libc_seek;
+        dvdcss->pf_read  = libc_read;
+        dvdcss->pf_readv = libc_readv;
         return os2_open( dvdcss, psz_device );
 #endif /* ! ( defined( WIN32 ) || defined( __OS2__ ) ) */
     }
-- 
2.1.0



More information about the libdvdcss-devel mailing list