[Libreoffice-commits] core.git: include/apple_remote

[Stephan Bergmann]

 include/apple_remote/RemoteControl.h        |    6 +++++-
 include/apple_remote/RemoteMainController.h |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 645c97d116c9d930c06297bdc292c52ac412fce9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 13 10:12:59 2013 +0200

    Fix visibility for --enable-64-bit
    
    ...post 68e2a4e41d6e81a6e95a296d775c9ac8f5c97e8b "Revert 'Visibility doesn't
    seem to work as we want in Apple's Clang.'"
    
    Quoting <https://developer.apple.com/library/mac/documentation/developertools/
    Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html> section "Symbol
    Visibility and Objective-C:"  "When building for x86_64 OS X or for iOS, symbol
    visibility /does/ affect objective-C classes.  [...]  This means that if a given
    class is intended to be usable outside the library or executable it's defined
    in, you need to ensure proper symbol visibility."
    
    The chosen syntax works at least with both --en/disable-64-bit "experimental"
    (Clang-based) builds on OS X 10.8.  Hopefully, it also works for baseline
    builds.  (Also, it could be that a more fine grained use of
    SAL_DLLPUBLIC_EXPORT/SAL_DLLPRIVATE would be useful, but with the current setup
    at least linking of Library_vcl against Library_AppleRemote works.)
    
    Change-Id: Iff4fe9e50d1400c83879f62fe29b35bd19d58eb8

diff --git a/include/apple_remote/RemoteControl.h b/include/apple_remote/RemoteControl.h
index 6e2c677..2dab731 100644
--- a/include/apple_remote/RemoteControl.h
+++ b/include/apple_remote/RemoteControl.h
@@ -29,8 +29,12 @@
  *
  *****************************************************************************/
 
+#include "sal/config.h"
+
 #import <Cocoa/Cocoa.h>
 
+#include "sal/types.h"
+
 // notifaction names that are being used to signal that an application wants to
 // have access to the remote control device or if the application has finished
 // using the remote control device
@@ -82,7 +86,7 @@ typedef enum _RemoteControlEventIdentifier {
 /*
     Base Interface for Remote Control devices
 */
- at interface RemoteControl : NSObject {
+SAL_DLLPUBLIC_EXPORT @interface RemoteControl : NSObject {
     id delegate;
 }
 
diff --git a/include/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h
index 5fde463..e00a790 100644
--- a/include/apple_remote/RemoteMainController.h
+++ b/include/apple_remote/RemoteMainController.h
@@ -29,8 +29,12 @@
  *
  *****************************************************************************/
 
+#include "sal/config.h"
+
 #import <Cocoa/Cocoa.h>
 
+#include "sal/types.h"
+
 #define AppleRemoteControlEvent 15
 
 @class RemoteControl;
@@ -38,7 +42,7 @@
 
 //static void sendTheEvent( unichar, int );
 
- at interface MainController : NSObject {
+SAL_DLLPUBLIC_EXPORT @interface MainController : NSObject {
 @public // else remoteControl is not reachable from GetSalData()->mpMainController
     RemoteControl* remoteControl;
 @private