[vlc-commits] commit: ifdef out 32-bit Carbon API calls on x86_64 (David Menestrina )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | David Menestrina <dmenest-vlc at ofb.net> | Thu Apr 15 18:34:44 2010 -0700| [56335ed186a104492806ecc345bfc72195ae3b67] | committer: Jean-Baptiste Kempf 

ifdef out 32-bit Carbon API calls on x86_64

The Mac OS Carbon APIs are not available to 64-bit applications.
This change just ifdefs out calls to them to avoid compiler errors.
In 64-bit, NPP_HandleEvent will have to be rewritten to use the
Cocoa event model.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 4e01592ec1c27e28e606a75cd5d9848b7da1a821)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=56335ed186a104492806ecc345bfc72195ae3b67
---

 projects/mozilla/vlcshell.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 274c057..f2b9f3e 100644
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -163,6 +163,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
         return false;
     }
 
+#ifndef __x86_64__  
     EventRecord *myEvent = (EventRecord*)event;
 
     switch( myEvent->what )
@@ -255,6 +256,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
         default:
             ;
     }
+#endif // __x86_64__
     return false;
 }
 #endif /* XP_MACOSX */