Revert the so-called whitelisting commits that are actually blacklisting

[vlc] / modules / access / vcd / cdrom.c

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index d1ac990aa584380778874409e0b5082a664be1f9..c78876f984618101385bb13aa8199fa07faa91c5 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -457,7 +457,7 @@ int ioctl_GetTracksMap( vlc_object_t *p_this, const vcddev_t *p_vcddev,
              if( *pp_sectors == NULL )
              {
                  msg_Err( p_this, "out of memory" );
-                 return NULL;
+                 return 0;
              }
 
              toc_entries.address_format = CD_LBA_FORMAT;
@@ -1157,10 +1157,8 @@ static int win32_vcd_open( vlc_object_t * p_this, const char *psz_dev,
         hASPI = LoadLibrary( "wnaspi32.dll" );
         if( hASPI != NULL )
         {
-            (FARPROC) lpGetSupport = GetProcAddress( hASPI,
-                                                     "GetASPI32SupportInfo" );
-            (FARPROC) lpSendCommand = GetProcAddress( hASPI,
-                                                      "SendASPI32Command" );
+            lpGetSupport = (void *)GetProcAddress( hASPI, "GetASPI32SupportInfo" );
+            lpSendCommand = (void *)GetProcAddress( hASPI, "SendASPI32Command" );
         }
 
         if( hASPI == NULL || lpGetSupport == NULL || lpSendCommand == NULL )