Merge lp:~raof/mir/mirclient-symbols into lp:mir

[Chris Halse Rogers]

Add a symbols file for libmirclient.

This documents (a) what our symbols are, and (b) when they first appeared.

Also hide a whole bunch of symbols that libmirclient doesn't actually need to export,
and version our existing symbols. This means we'll be able to change the semantics,
prototypes, or remove whole symbols from client library and remove symbols without needing to break ABI.

Hiding the symbols also reduces our exported symbol list by two orders of magnitude,
provides a performance boost for client startup that might even be mesurable (I haven't measured it ☺).

Annotate our client API symbols with a deb-symbols file; this documents (a) what our symbols are, and (b) when they first appeared.

Also hide a whole bunch of symbols what libmirclient doesn't actually need to export. Ideally we could reduce this set down to the API we define in mir_toolkit/*.h, but for various reasons, sensible and otherwise, this branch only halves our exported symbol count, rather than reducing it by two orders of magnitude.

[lp:~raof/mir/mirclient-symbols]

862. By Chris Halse Rogers on 2014-07-16

Merge trunk, updating for prompt session API change

863. By Chris Halse Rogers on 2014-07-16

Whoops. Remove conflict detritus

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:863
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/959
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/951/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/682/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/680/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3191/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2161/rebuild

review: Needs Fixing (continuous-integration)

[lp:~raof/mir/mirclient-symbols]

864. By Chris Halse Rogers on 2014-07-16

Whoops. Also remove the prompt session symbol form the symbols file!

865. By Chris Halse Rogers on 2014-07-16

Oops. Also do the static mirclientplatform for Android

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:865
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/964
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/953/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/684/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/682/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3201/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2163/rebuild

review: Needs Fixing (continuous-integration)

[lp:~raof/mir/mirclient-symbols]

866. By Chris Halse Rogers on 2014-07-21

Version the libmirclient symbols

While we're at it, don't export all the stupid C++ detritus.
Keep the symbol visibility flags, as that allows the compiler
to generate better code.

867. By Chris Halse Rogers on 2014-07-21

Merge trunk, annotating the two new mirclient symbols

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:867
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1014
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/718/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/719/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3396/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2196/rebuild

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

Seems ok to me! Jenkins failure actually looks unrelated (libeatmydata)...I see some warnings though

dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
dpkg-gensymbols: warning: some symbols or patterns disappeared in the symbols file: see diff output below
dpkg-gensymbols: warning: debian/libmirclient8/DEBIAN/symbols doesn't match completely debian/libmirclient8.symbols

review: Approve

[lp:~raof/mir/mirclient-symbols]

868. By Chris Halse Rogers on 2014-07-21

Handle some oddities of the CI builder's symbols.

I don't know how GCC can get away with not exporting a symbol for ~AgingBuffer,
but apparently it does.

Likewise, the presence or absense of __gcov_var isn't interesting to us.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:868
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2206/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1028/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1034/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1020/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/728/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/729/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3480/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2206/rebuild

review: Needs Fixing (continuous-integration)

[lp:~raof/mir/mirclient-symbols]

869. By Chris Halse Rogers on 2014-07-22

Merge trunk, updating symbols for new cursors

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:869
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/729
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/730
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/730/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2143
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10190

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2207/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

- So as we break client ABI, we rename the file to the new number, e.g. libmirclient9.symbols, and add the newly introduced entry point?

- What happens if we drop an entry point? Do we simply delete the entry or is there a way to make it "obsoleted in" (in symmetry with "introduced in")?

- And what is the 0.6 in MIR_CLIENT_0.6? The next series? How does that change over time?

review: Needs Information

[Chris Halse Rogers (raof)]

1) Adding new symbols doesn't break ABI; if we just add new symbols (or add new fields to the end of an opaque struct, etc) then we don't need to change the number.

If we add an entry point, we add it to the .symbols file, with the version it was introduced in. The packaging tools can then add appropriately versioned dependencies.

2) If we drop an entry point then we do indeed need to break ABI (but see point (3)), need to change the SONAME, and remove the symbol form the .symbols file. There's no ability to mark the symbol as “obsoleted in”, because that information isn't useful (to the packaging system) - the symbol doesn't appear in any version of the library called “libmirclient.so.9”.

(3) The 0.6 in MIR_CLIENT_0.6 is because I thought 0.6 was likely to be the version this would release in; it's just an arbitrary version string that doesn't even need to satisfy an ordering constraint (nothing ever tries to compare for anything except equality). It's from the symbols.map file where I version the symbols (see https://sourceware.org/binutils/docs/ld/VERSION.html )

Now, having versioned symbols means we've got a lot more flexibility in the changes we can make without breaking the ABI. We can change the meaning of symbols without breaking ABI by providing both the old symbol and the new symbol under the same name with different versions. It also means that if we somehow manage to get two versions of libmirclient loaded into the same process the linker can disambiguate correctly.

[Cemil Azizoglu (cemil-azizoglu)]

1) So do we need to rename the file when we add an entry point ? libmirclient8.symbols -> libmirclient9.symbols

3) I don't think we should have branch references (0.6) in the name, as the name no longer makes sense when merged in other branches.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

156 +MIR_API MirWaitHandle *mir_connection_drm_auth_magic(MirConnection *connection,
157 + unsigned int magic,

169 +MIR_API int mir_connection_drm_set_gbm_device(MirConnection* connection,
170 + struct gbm_device* dev);

429 +MIR_API void mir_surface_set_event_handler(MirSurface *surface,
430 + MirEventDelegate const *event_handler);

These use tabs instead of spaces.

review: Needs Fixing

[Chris Halse Rogers (raof)]

> 1) So do we need to rename the file when we add an entry point ?
> libmirclient8.symbols -> libmirclient9.symbols

No, only when we break ABI. Adding an entry point doesn't break ABI.

> 3) I don't think we should have branch references (0.6) in the name, as the
> name no longer makes sense when merged in other branches.

Fair enough. I can call it MIR_CLIENT_1 if you'd prefer.

[Alexandros Frantzis (afrantzis)]

> > 1) So do we need to rename the file when we add an entry point ?
> > libmirclient8.symbols -> libmirclient9.symbols
>
> No, only when we break ABI. Adding an entry point doesn't break ABI.
>
>
> > 3) I don't think we should have branch references (0.6) in the name, as the
> > name no longer makes sense when merged in other branches.
>
> Fair enough. I can call it MIR_CLIENT_1 if you'd prefer.

MIR_CLIENT_<CLIENT_ABI_VERSION> ?

[Chris Halse Rogers (raof)]

Would also work :)

[Cemil Azizoglu (cemil-azizoglu)]

LGTM (once updated for the requested changes).

review: Approve

[Alan Griffiths (alan-griffiths)]

I'm probably missing something but...

What is the purpose of this macro?

666 +#define MIR_API __attribute__((visibility("default")))

Surely, without it the behavior is exactly the same? (I.e. default visibility)

review: Needs Information

[Alexandros Frantzis (afrantzis)]

> I'm probably missing something but...
>
> What is the purpose of this macro?
>
> 666 +#define MIR_API __attribute__((visibility("default")))
>
> Surely, without it the behavior is exactly the same? (I.e. default visibility)

This MP also changes the default visibility to "hidden":

791 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

[Alan Griffiths (alan-griffiths)]

9 +# The libmirclientplatform plugin requires mir::client::AgingBuffer
10 +# We could probably get around needing to export these by dlopen()
11 +# trickery, which would be nice.
12 + (c++)"mir::client::AgingBuffer::increment_age()@MIR_CLIENT_0.6" 0.5.0
13 + (c++)"mir::client::AgingBuffer::mark_as_submitted()@MIR_CLIENT_0.6" 0.5.0
14 + (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
15 + (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
16 +# For some reason gcc sometimes doesn't feel like emitting a symbol for
17 +# the destructor? How does that possibly work?
18 + (optional|c++)"mir::client::AgingBuffer::~AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
19 + (c++)"mir::client::AgingBuffer::age() const@MIR_CLIENT_0.6" 0.5.0
20 + (c++)"typeinfo for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
21 + (c++)"typeinfo name for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
22 + (c++)"vtable for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0

This is a pretty trivial class (as is mir::Fd which needs the same treatment)

These seem to be the only reason for linking mirclientplatformandroid to libmirclient and therefore exporting these symbols. Maybe it would be better to put these classes either directly into these libraries (or maybe mir::Fd into libmircommon)?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

800 +add_library(
801 + mirclient-static

Is creating a .a file actually the best option as we don't need to distribute it? Or would a OBJECT library be a better approach? (Alan's shiny new tool since Daniel showed it to him yesterday.)

[Chris Halse Rogers (raof)]

On Fri, Jul 25, 2014 at 8:48 PM, Alan Griffiths <email address hidden>
wrote:
> 800 +add_library(
> 801 + mirclient-static
>
> Is creating a .a file actually the best option as we don't need to
> distribute it? Or would a OBJECT library be a better approach?
> (Alan's shiny new tool since Daniel showed it to him yesterday.)

Oooh, intriguing. I shall investimagate.

[Chris Halse Rogers (raof)]

On Fri, Jul 25, 2014 at 8:34 PM, Alan Griffiths <email address hidden>
wrote:
> Review: Needs Information
>
> 9 +# The libmirclientplatform plugin requires mir::client::AgingBuffer
> 10 +# We could probably get around needing to export these by dlopen()
> 11 +# trickery, which would be nice.
> 12 + (c++)"mir::client::AgingBuffer::increment_age()@MIR_CLIENT_0.6"
> 0.5.0
> 13 +
> (c++)"mir::client::AgingBuffer::mark_as_submitted()@MIR_CLIENT_0.6"
> 0.5.0
> 14 + (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6"
> 0.5.0
> 15 + (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6"
> 0.5.0
> 16 +# For some reason gcc sometimes doesn't feel like emitting a
> symbol for
> 17 +# the destructor? How does that possibly work?
> 18 +
> (optional|c++)"mir::client::AgingBuffer::~AgingBuffer()@MIR_CLIENT_0.6"
> 0.5.0
> 19 + (c++)"mir::client::AgingBuffer::age() const@MIR_CLIENT_0.6" 0.5.0
> 20 + (c++)"typeinfo for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
> 21 + (c++)"typeinfo name for mir::client::AgingBuffer@MIR_CLIENT_0.6"
> 0.5.0
> 22 + (c++)"vtable for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
>
> This is a pretty trivial class (as is mir::Fd which needs the same
> treatment)
>
> These seem to be the only reason for linking mirclientplatformandroid
> to libmirclient and therefore exporting these symbols. Maybe it would
> be better to put these classes either directly into these libraries
> (or maybe mir::Fd into libmircommon)?

Yeah. mcl:::AgingBuffer isn't useful outside these libraries, so that
can just get folded in. mir::Fd probably belongs in libmircommon.

[Alan Griffiths (alan-griffiths)]

> > I'm probably missing something but...
> >
> > What is the purpose of this macro?
> >
> > 666 +#define MIR_API __attribute__((visibility("default")))
> >
> > Surely, without it the behavior is exactly the same? (I.e. default
> visibility)
>
> This MP also changes the default visibility to "hidden":
>
> 791 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

What I mean is can't we do what we want without needing this macro? Vis:

https://code.launchpad.net/~alan-griffiths/mir/fix-libmirclient/+merge/228336

[Chris Halse Rogers (raof)]

Ah, right.

Yes, the visibility of the symbols can be controlled just using the linker script, but it's still worth aid the visibility attribute and associated macro: gcc can produce better code when it knows that symbols can't be used outside.

-----Original Message-----
From: "Alan Griffiths" <email address hidden>
Sent: ‎26/‎07/‎2014 2:22
To: "Alexandros Frantzis" <email address hidden>
Subject: Re: [Merge] lp:~raof/mir/mirclient-symbols into lp:mir/devel

> > I'm probably missing something but...
> >
> > What is the purpose of this macro?
> >
> > 666 +#define MIR_API __attribute__((visibility("default")))
> >
> > Surely, without it the behavior is exactly the same? (I.e. default
> visibility)
>
> This MP also changes the default visibility to "hidden":
>
> 791 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

What I mean is can't we do what we want without needing this macro? Vis:

https://code.launchpad.net/~alan-griffiths/mir/fix-libmirclient/+merge/228336
--
https://code.launchpad.net/~raof/mir/mirclient-symbols/+merge/226949
You are the owner of lp:~raof/mir/mirclient-symbols.

[Alan Griffiths (alan-griffiths)]

> Ah, right.
>
> Yes, the visibility of the symbols can be controlled just using the linker
> script, but it's still worth aid the visibility attribute and associated
> macro: gcc can produce better code when it knows that symbols can't be used
> outside.

Sorry, I still don't get it.

The symbols are still available externally to the translation unit so the compile phase can't really treat them any differently. The link phase has access to both the linker script and any attributes propagated by the compiler.

That is, any optimization "visibility=hidden" enables can be applied however the visibility is managed.

[Chris Halse Rogers (raof)]

It's possible that I'm misreading it, but https://gcc.gnu.org/wiki/Visibility says “Furthermore, using linker version scripts doesn't permit GCC to better optimise the code.”

I can come up with vaguely plausible-sounding reasons why this may be the case, but I've insufficient experience with gcc internals to say anything other than “the documentation says so” :)

[Alan Griffiths (alan-griffiths)]

> It's possible that I'm misreading it, but https://gcc.gnu.org/wiki/Visibility
> says “Furthermore, using linker version scripts doesn't permit GCC to better
> optimise the code.”

As I read it it claims the gnu linker doesn't (at least currently) eliminate indirection through the global offset table for calls within the current so.

AFAICS that's /possible/ at link time.

> I can come up with vaguely plausible-sounding reasons why this may be the
> case, but I've insufficient experience with gcc internals to say anything
> other than “the documentation says so” :)

I too don't know enough about GCC internals to argue that this optimization is actually implemented. OTOH There are link time optimization options (e.g. -flto and -fuse-linker-plugin) that sound like they ought to handle it.

[Chris Halse Rogers (raof)]

Alan's lp:~alan-griffiths/mir/fix-libmirclient should do this fine; once it lands I'll add the symbols file on top.

Unmerged revisions

869. By Chris Halse Rogers on 2014-07-22

Merge trunk, updating symbols for new cursors

868. By Chris Halse Rogers on 2014-07-21

Handle some oddities of the CI builder's symbols.

I don't know how GCC can get away with not exporting a symbol for ~AgingBuffer,
but apparently it does.

Likewise, the presence or absense of __gcov_var isn't interesting to us.

867. By Chris Halse Rogers on 2014-07-21

Merge trunk, annotating the two new mirclient symbols

866. By Chris Halse Rogers on 2014-07-21

Version the libmirclient symbols

While we're at it, don't export all the stupid C++ detritus.
Keep the symbol visibility flags, as that allows the compiler
to generate better code.

865. By Chris Halse Rogers on 2014-07-16

Oops. Also do the static mirclientplatform for Android

864. By Chris Halse Rogers on 2014-07-16

Whoops. Also remove the prompt session symbol form the symbols file!

863. By Chris Halse Rogers on 2014-07-16

Whoops. Remove conflict detritus

862. By Chris Halse Rogers on 2014-07-16

Merge trunk, updating for prompt session API change

861. By Chris Halse Rogers on 2014-07-16

Use --exclude-libs linker flag on libmirclient.

This causes the linker to hide all the symbols from the static
archives we include, rather than having to do two separate builds
one with -fvisibility=hidden, one without

860. By Chris Halse Rogers on 2014-07-16

Add symbols file for libmirclient

This adds some extra checking that we don't break client ABI, and documents
when certain symbols arrived

=== added file 'debian/libmirclient8.symbols'
--- debian/libmirclient8.symbols	1970-01-01 00:00:00 +0000
+++ debian/libmirclient8.symbols	2014-07-22 03:06:31 +0000
@@ -0,0 +1,93 @@
+libmirclient.so.8 libmirclient8 #MINVER#
+ MIR_CLIENT_0.6@MIR_CLIENT_0.6 0.5.0
+# Our CI builds get built with gcov, which adds this superfluity.
+ (optional)"__gcov_var@Base" 0.5.0
+# The libmirclientplatform plugin requires mir::client::AgingBuffer
+# We could probably get around needing to export these by dlopen()
+# trickery, which would be nice.
+ (c++)"mir::client::AgingBuffer::increment_age()@MIR_CLIENT_0.6" 0.5.0
+ (c++)"mir::client::AgingBuffer::mark_as_submitted()@MIR_CLIENT_0.6" 0.5.0
+ (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
+ (c++)"mir::client::AgingBuffer::AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
+# For some reason gcc sometimes doesn't feel like emitting a symbol for
+# the destructor? How does that possibly work?
+ (optional|c++)"mir::client::AgingBuffer::~AgingBuffer()@MIR_CLIENT_0.6" 0.5.0
+ (c++)"mir::client::AgingBuffer::age() const@MIR_CLIENT_0.6" 0.5.0
+ (c++)"typeinfo for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
+ (c++)"typeinfo name for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
+ (c++)"vtable for mir::client::AgingBuffer@MIR_CLIENT_0.6" 0.5.0
+# And now our *actual* ABI
+ mir_connect@MIR_CLIENT_0.6 0.5.0
+ mir_connect_sync@MIR_CLIENT_0.6 0.5.0
+ mir_connection_apply_display_config@MIR_CLIENT_0.6 0.5.0
+ mir_connection_create_display_config@MIR_CLIENT_0.6 0.5.0
+ mir_connection_create_prompt_session_sync@MIR_CLIENT_0.6 0.5.0
+ mir_connection_create_screencast_sync@MIR_CLIENT_0.6 0.5.0
+ mir_connection_create_surface@MIR_CLIENT_0.6 0.5.0
+ mir_connection_create_surface_sync@MIR_CLIENT_0.6 0.5.0
+ mir_connection_drm_auth_magic@MIR_CLIENT_0.6 0.5.0
+ mir_connection_drm_set_gbm_device@MIR_CLIENT_0.6 0.5.0
+ mir_connection_get_available_surface_formats@MIR_CLIENT_0.6 0.5.0
+ mir_connection_get_display_info@MIR_CLIENT_0.6 0.5.0
+ mir_connection_get_egl_native_display@MIR_CLIENT_0.6 0.5.0
+ mir_connection_get_error_message@MIR_CLIENT_0.6 0.5.0
+ mir_connection_get_platform@MIR_CLIENT_0.6 0.5.0
+ mir_connection_is_valid@MIR_CLIENT_0.6 0.5.0
+ mir_connection_release@MIR_CLIENT_0.6 0.5.0
+ mir_connection_set_display_config_change_callback@MIR_CLIENT_0.6 0.5.0
+ mir_connection_set_lifecycle_event_callback@MIR_CLIENT_0.6 0.5.0
+ mir_cursor_configuration_destroy@MIR_CLIENT_0.6 0.5.0
+ mir_cursor_configuration_from_name@MIR_CLIENT_0.6 0.5.0
+ mir_display_config_destroy@MIR_CLIENT_0.6 0.5.0
+ mir_prompt_session_error_message@MIR_CLIENT_0.6 0.5.0
+ mir_prompt_session_is_valid@MIR_CLIENT_0.6 0.5.0
+ mir_prompt_session_new_fds_for_prompt_providers@MIR_CLIENT_0.6 0.5.0
+ mir_prompt_session_release_sync@MIR_CLIENT_0.6 0.5.0
+ mir_screencast_egl_native_window@MIR_CLIENT_0.6 0.5.0
+ mir_screencast_release_sync@MIR_CLIENT_0.6 0.5.0
+ mir_surface_configure_cursor@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_current_buffer@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_dpi@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_egl_native_window@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_error_message@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_focus@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_graphics_region@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_id@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_orientation@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_parameters@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_platform_type@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_state@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_swapinterval@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_type@MIR_CLIENT_0.6 0.5.0
+ mir_surface_get_visibility@MIR_CLIENT_0.6 0.5.0
+ mir_surface_is_valid@MIR_CLIENT_0.6 0.5.0
+ mir_surface_release@MIR_CLIENT_0.6 0.5.0
+ mir_surface_release_sync@MIR_CLIENT_0.6 0.5.0
+ mir_surface_set_event_handler@MIR_CLIENT_0.6 0.5.0
+ mir_surface_set_state@MIR_CLIENT_0.6 0.5.0
+ mir_surface_set_swapinterval@MIR_CLIENT_0.6 0.5.0
+ mir_surface_set_type@MIR_CLIENT_0.6 0.5.0
+ mir_surface_swap_buffers@MIR_CLIENT_0.6 0.5.0
+ mir_surface_swap_buffers_sync@MIR_CLIENT_0.6 0.5.0
+ mir_wait_for@MIR_CLIENT_0.6 0.5.0
+ mir_wait_for_one@MIR_CLIENT_0.6 0.5.0
+# Let's put all the cursors together
+ mir_default_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_disabled_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_arrow_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_busy_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_caret_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_pointing_hand_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_open_hand_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_closed_hand_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_horizontal_resize_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_vertical_resize_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_diagonal_resize_bottom_to_top_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_diagonal_resize_top_to_bottom_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_omnidirectional_resize_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_vsplit_resize_cursor_name@MIR_CLIENT_0.6 0.5.0
+ mir_hsplit_resize_cursor_name@MIR_CLIENT_0.6 0.5.0
+# Anything that uses the debug interfaces is asking for trouble,
+# as we reserve the right to break these at will.
+ mir_debug_surface_current_buffer_id@MIR_CLIENT_0.6 0.5.0
+ mir_debug_surface_id@MIR_CLIENT_0.6 0.5.0

=== modified file 'include/client/mir_toolkit/mir_client_library_debug.h'
--- include/client/mir_toolkit/mir_client_library_debug.h	2014-03-06 06:05:17 +0000
+++ include/client/mir_toolkit/mir_client_library_debug.h	2014-07-22 03:06:31 +0000
@@ -20,15 +20,25 @@
 
 #include <mir_toolkit/mir_client_library.h>
 
-/* This header defines debug interfaces that aren't expected to be generally useful
- * and do not have the same API-stability guarantees that the main API has */
+#ifdef __cplusplus
+/**
+ * \addtogroup mir_toolkit
+ * @{
+ */
+/** 
+ * This header defines debug interfaces that aren't expected to be generally useful
+ * and do not have the same API-stability guarantees that the main API has
+ */
+
+extern "C" {
+#endif
 
 /**
  * Return the ID of a surface (only useful for debug output).
  *   \param [in] surface  The surface
  *   \return              An internal ID that identifies the surface
  */
-int mir_debug_surface_id(MirSurface *surface);
+MIR_API int mir_debug_surface_id(MirSurface *surface);
 
 /**
  * Get the ID of the surface's current buffer (only useful for debug purposes)
@@ -38,6 +48,11 @@
  *                                This is the buffer that is currently being drawn to,
  *                                and would be returned by mir_surface_get_current_buffer.
  */
-uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface);
+MIR_API uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface);
+
+#ifdef __cplusplus
+}
+#endif
+/**@}*/
 
 #endif /* MIR_CLIENT_LIBRARY_DEBUG_H */

=== modified file 'include/client/mir_toolkit/mir_client_library_drm.h'
--- include/client/mir_toolkit/mir_client_library_drm.h	2014-03-06 06:05:17 +0000
+++ include/client/mir_toolkit/mir_client_library_drm.h	2014-07-22 03:06:31 +0000
@@ -32,10 +32,10 @@
 typedef void (*mir_drm_auth_magic_callback)(int status, void *context);
 
 /* Authenticates a DRM magic cookie */
-MirWaitHandle *mir_connection_drm_auth_magic(MirConnection *connection,
-                                             unsigned int magic,
-                                             mir_drm_auth_magic_callback callback,
-                                             void *context);
+MIR_API MirWaitHandle *mir_connection_drm_auth_magic(MirConnection *connection,
+						     unsigned int magic,
+						     mir_drm_auth_magic_callback callback,
+						     void *context);
 
 /**
  * Set the gbm_device to be used by the EGL implementation.
@@ -46,8 +46,8 @@
  * \return                 A non-zero value if the operation was successful,
  *                         0 otherwise
  */
-int mir_connection_drm_set_gbm_device(MirConnection* connection,
-                                      struct gbm_device* dev);
+MIR_API int mir_connection_drm_set_gbm_device(MirConnection* connection,
+					      struct gbm_device* dev);
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2014-06-09 13:48:18 +0000
+++ include/client/mir_toolkit/mir_connection.h	2014-07-22 03:06:31 +0000
@@ -45,7 +45,7 @@
  *   \param [in,out] context  User data passed to the callback function
  *   \return                  A handle that can be passed to mir_wait_for
  */
-MirWaitHandle *mir_connect(
+MIR_API MirWaitHandle *mir_connect(
     char const *server,
     char const *app_name,
     mir_connected_callback callback,
@@ -58,7 +58,7 @@
  *   \param [in] app_name  A name referring to the application
  *   \return               The resulting MirConnection
  */
-MirConnection *mir_connect_sync(char const *server, char const *app_name);
+MIR_API MirConnection *mir_connect_sync(char const *server, char const *app_name);
 
 /**
  * Test for a valid connection
@@ -66,7 +66,7 @@
  * \return                 True if the supplied connection is valid, or
  *                         false otherwise.
  */
-MirBool mir_connection_is_valid(MirConnection *connection);
+MIR_API MirBool mir_connection_is_valid(MirConnection *connection);
 
 /**
  * Retrieve a text description of the last error. The returned string is owned
@@ -76,13 +76,13 @@
  *                           invalid connection, or the empty string "" if the
  *                           connection is valid.
  */
-char const *mir_connection_get_error_message(MirConnection *connection);
+MIR_API char const *mir_connection_get_error_message(MirConnection *connection);
 
 /**
  * Release a connection to the Mir server
  *   \param [in] connection  The connection
  */
-void mir_connection_release(MirConnection *connection);
+MIR_API void mir_connection_release(MirConnection *connection);
 
 /**
  * Query platform-specific data and/or file descriptors that are required to
@@ -90,7 +90,7 @@
  *   \param [in]  connection        The connection
  *   \param [out] platform_package  Structure to be populated
  */
-void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package);
+MIR_API void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package);
 
 /**
  * Register a callback to be called when a Lifecycle state change occurs.
@@ -98,14 +98,14 @@
  *   \param [in] callback       The function to be called when the state change occurs
  *   \param [in,out] context    User data passed to the callback function
  */
-void mir_connection_set_lifecycle_event_callback(MirConnection* connection,
+MIR_API void mir_connection_set_lifecycle_event_callback(MirConnection* connection,
     mir_lifecycle_event_callback callback, void* context);
 
 /**
  * \deprecated Use mir_connection_create_display_config
  */
 __attribute__((__deprecated__("Use mir_connection_create_display_config()")))
-void mir_connection_get_display_info(MirConnection *connection, MirDisplayInfo *display_info);
+MIR_API void mir_connection_get_display_info(MirConnection *connection, MirDisplayInfo *display_info);
 
 /**
  * Query the display
@@ -114,7 +114,7 @@
  *   \param [in]  connection        The connection
  *   \return                        structure that describes the display configuration
  */
-MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection);
+MIR_API MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection);
 
 /**
  * Register a callback to be called when the hardware display configuration changes
@@ -126,7 +126,7 @@
  *   \param [in] callback     The function to be called when a display change occurs
  *   \param [in,out] context  User data passed to the callback function
  */
-void mir_connection_set_display_config_change_callback(
+MIR_API void mir_connection_set_display_config_change_callback(
     MirConnection* connection,
     mir_display_config_callback callback, void* context);
 
@@ -134,7 +134,7 @@
  * Destroy the DisplayConfiguration resource acquired from mir_connection_create_display_config
  *   \param [in] display_configuration  The display_configuration information resource to be destroyed
  */
-void mir_display_config_destroy(MirDisplayConfiguration* display_configuration);
+MIR_API void mir_display_config_destroy(MirDisplayConfiguration* display_configuration);
 
 /**
  * Apply the display configuration
@@ -149,14 +149,14 @@
  *   \param [in] display_configuration  The display_configuration to apply
  *   \return                            A handle that can be passed to mir_wait_for
  */
-MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
+MIR_API MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
 
 /**
  * Get a display type that can be used for OpenGL ES 2.0 acceleration.
  *   \param [in] connection  The connection
  *   \return                 An EGLNativeDisplayType that the client can use
  */
-MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection);
+MIR_API MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection);
 
 /**
  * Get the list of possible formats that a surface can be created with.
@@ -165,7 +165,7 @@
  *   \param [in]  formats_size      size of formats list
  *   \param [out] num_valid_formats number of valid formats returned in formats
  */
-void mir_connection_get_available_surface_formats(
+MIR_API void mir_connection_get_available_surface_formats(
     MirConnection* connection, MirPixelFormat* formats,
     unsigned const int format_size, unsigned int *num_valid_formats);
 

=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
--- include/client/mir_toolkit/mir_cursor_configuration.h	2014-07-01 16:53:35 +0000
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2014-07-22 03:06:31 +0000
@@ -38,7 +38,7 @@
  * Release resources assosciated with cursor parameters
  *     \param [in] parameters The operand
  */
-void mir_cursor_configuration_destroy(MirCursorConfiguration *parameters);
+MIR_API void mir_cursor_configuration_destroy(MirCursorConfiguration *parameters);
 
 /**
  * Returns a new MirCursorConfiguration representing a named cursor
@@ -50,7 +50,7 @@
  *    \return A cursor parameters object which must be passed
  *            to_mir_cursor_configuration_destroy
  */
-MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
+MIR_API MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_prompt_session.h'
--- include/client/mir_toolkit/mir_prompt_session.h	2014-07-16 03:38:05 +0000
+++ include/client/mir_toolkit/mir_prompt_session.h	2014-07-22 03:06:31 +0000
@@ -37,7 +37,7 @@
  *   \param [in,out] context            User data passed to the callback functions
  *   \return                            A handle that can be passed to mir_wait_for
  */
-MirPromptSession *mir_connection_create_prompt_session_sync(
+MIR_API MirPromptSession *mir_connection_create_prompt_session_sync(
     MirConnection* connection,
     pid_t application_pid,
     mir_prompt_session_state_change_callback state_change_callback,
@@ -57,7 +57,7 @@
  *   \param [in,out] context     User data passed to the callback function
  *   \return                     A handle that can be passed to mir_wait_for
  */
-MirWaitHandle* mir_prompt_session_new_fds_for_prompt_providers(
+MIR_API MirWaitHandle* mir_prompt_session_new_fds_for_prompt_providers(
     MirPromptSession *prompt_session,
     unsigned int no_of_fds,
     mir_client_fd_callback callback,
@@ -67,14 +67,14 @@
  * Stop and release the specified prompt session
  *   \param [in] prompt_session  The prompt session
  */
-void mir_prompt_session_release_sync(MirPromptSession *prompt_session);
+MIR_API void mir_prompt_session_release_sync(MirPromptSession *prompt_session);
 
 /**
  * Test for a valid prompt session
  *   \param [in] prompt_session  The prompt session
  *   \return                     True if prompt_session is valid, false otherwise
  */
-MirBool mir_prompt_session_is_valid(MirPromptSession *prompt_session);
+MIR_API MirBool mir_prompt_session_is_valid(MirPromptSession *prompt_session);
 
 /**
  * Retrieve a text description of the last error. The returned string is owned
@@ -84,7 +84,7 @@
  *                           invalid connection, or the empty string "" if the
  *                           connection is valid.
  */
-char const *mir_prompt_session_error_message(MirPromptSession *prompt_session);
+MIR_API char const *mir_prompt_session_error_message(MirPromptSession *prompt_session);
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_screencast.h'
--- include/client/mir_toolkit/mir_screencast.h	2014-01-29 09:29:55 +0000
+++ include/client/mir_toolkit/mir_screencast.h	2014-07-22 03:06:31 +0000
@@ -37,7 +37,7 @@
  *   \param [in] parameters  The screencast parameters
  *   \return                 The resulting screencast
  */
-MirScreencast *mir_connection_create_screencast_sync(
+MIR_API MirScreencast *mir_connection_create_screencast_sync(
     MirConnection *connection,
     MirScreencastParameters *parameters);
 
@@ -45,7 +45,7 @@
  * Release the specified screencast.
  *   \param [in] screencast  The screencast to be released
  */
-void mir_screencast_release_sync(
+MIR_API void mir_screencast_release_sync(
     MirScreencast *screencast);
 
 /**
@@ -53,7 +53,7 @@
  *   \param [in] screencast  The screencast
  *   \return                 An EGLNativeWindowType that the client can use
  */
-MirEGLNativeWindowType mir_screencast_egl_native_window(
+MIR_API MirEGLNativeWindowType mir_screencast_egl_native_window(
     MirScreencast *screencast);
 
 #ifdef __cplusplus

=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2014-07-09 21:14:44 +0000
+++ include/client/mir_toolkit/mir_surface.h	2014-07-22 03:06:31 +0000
@@ -46,7 +46,7 @@
  *   \return                         A handle that can be passed to
  *                                   mir_wait_for
  */
-MirWaitHandle *mir_connection_create_surface(
+MIR_API MirWaitHandle *mir_connection_create_surface(
     MirConnection *connection,
     MirSurfaceParameters const *surface_parameters,
     mir_surface_callback callback,
@@ -59,7 +59,7 @@
  *   \param [in] params      Parameters describing the desired surface
  *   \return                 The resulting surface
  */
-MirSurface *mir_connection_create_surface_sync(
+MIR_API MirSurface *mir_connection_create_surface_sync(
     MirConnection *connection,
     MirSurfaceParameters const *params);
 
@@ -73,15 +73,15 @@
  *   \param [in] surface        The surface
  *   \param [in] event_handler  The event handler to call
  */
-void mir_surface_set_event_handler(MirSurface *surface,
-                                   MirEventDelegate const *event_handler);
+MIR_API void mir_surface_set_event_handler(MirSurface *surface,
+					   MirEventDelegate const *event_handler);
 
 /**
  * Get a window type that can be used for OpenGL ES 2.0 acceleration.
  *   \param [in] surface  The surface
  *   \return              An EGLNativeWindowType that the client can use
  */
-MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface);
+MIR_API MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface);
 
 /**
  * Test for a valid surface
@@ -89,7 +89,7 @@
  *   \return              True if the supplied surface is valid, or
  *                        false otherwise.
  */
-MirBool mir_surface_is_valid(MirSurface *surface);
+MIR_API MirBool mir_surface_is_valid(MirSurface *surface);
 
 /**
  * Retrieve a text description of the error. The returned string is owned by
@@ -100,7 +100,7 @@
  *                        invalid surface, or the empty string "" if the
  *                        connection is valid.
  */
-char const *mir_surface_get_error_message(MirSurface *surface);
+MIR_API char const *mir_surface_get_error_message(MirSurface *surface);
 
 /**
  * Get a surface's parameters.
@@ -108,7 +108,7 @@
  *   \param [in] surface      The surface
  *   \param [out] parameters  Structure to be populated
  */
-void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
+MIR_API void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
 
 /**
  * Get the underlying platform type so the buffer obtained in "raw" representation
@@ -117,7 +117,7 @@
  *   \param [in] surface      The surface
  *   \return                  One of mir_platform_type_android or mir_platform_type_gbm
  */
-MirPlatformType mir_surface_get_platform_type(MirSurface *surface);
+MIR_API MirPlatformType mir_surface_get_platform_type(MirSurface *surface);
 
 /**
  * Get a surface's buffer in "raw" representation.
@@ -125,7 +125,7 @@
  *   \param [in] surface          The surface
  *   \param [out] buffer_package  Structure to be populated
  */
-void mir_surface_get_current_buffer(MirSurface *surface, MirNativeBuffer **buffer_package);
+MIR_API void mir_surface_get_current_buffer(MirSurface *surface, MirNativeBuffer **buffer_package);
 
 /**
  * Get a surface's graphics_region, i.e., map the graphics buffer to main
@@ -134,7 +134,7 @@
  *   \param [in] surface           The surface
  *   \param [out] graphics_region  Structure to be populated
  */
-void mir_surface_get_graphics_region(
+MIR_API void mir_surface_get_graphics_region(
     MirSurface *surface,
     MirGraphicsRegion *graphics_region);
 
@@ -151,7 +151,7 @@
  *   \param [in,out] context  User data passed to the callback function
  *   \return                  A handle that can be passed to mir_wait_for
  */
-MirWaitHandle *mir_surface_swap_buffers(
+MIR_API MirWaitHandle *mir_surface_swap_buffers(
     MirSurface *surface,
     mir_surface_callback callback,
     void *context);
@@ -161,7 +161,7 @@
  * for the operation to complete.
  *   \param [in] surface  The surface whose buffer to advance
  */
-void mir_surface_swap_buffers_sync(MirSurface *surface);
+MIR_API void mir_surface_swap_buffers_sync(MirSurface *surface);
 
 /**
  * Release the supplied surface and any associated buffer. The returned wait
@@ -175,7 +175,7 @@
  *   \param [in,out] context  User data passed to the callback function
  *   \return                  A handle that can be passed to mir_wait_for
  */
-MirWaitHandle *mir_surface_release(
+MIR_API MirWaitHandle *mir_surface_release(
     MirSurface *surface,
     mir_surface_callback callback,
     void *context);
@@ -185,13 +185,13 @@
  * for the operation to complete.
  *   \param [in] surface  The surface to be released
  */
-void mir_surface_release_sync(MirSurface *surface);
+MIR_API void mir_surface_release_sync(MirSurface *surface);
 
 /**
  * \deprecated Use mir_debug_surface_id()
  */
 __attribute__((__deprecated__("Use mir_debug_surface_id()")))
-int mir_surface_get_id(MirSurface *surface);
+MIR_API int mir_surface_get_id(MirSurface *surface);
 
 /**
  * Set the type (purpose) of a surface. This is not guaranteed to always work
@@ -201,14 +201,14 @@
  *   \param [in] type     The new type of the surface
  *   \return              A wait handle that can be passed to mir_wait_for
  */
-MirWaitHandle* mir_surface_set_type(MirSurface *surface, MirSurfaceType type);
+MIR_API MirWaitHandle* mir_surface_set_type(MirSurface *surface, MirSurfaceType type);
 
 /**
  * Get the type (purpose) of a surface.
  *   \param [in] surface  The surface to query
  *   \return              The type of the surface
  */
-MirSurfaceType mir_surface_get_type(MirSurface *surface);
+MIR_API MirSurfaceType mir_surface_get_type(MirSurface *surface);
 
 /**
  * Change the state of a surface.
@@ -216,7 +216,7 @@
  *   \param [in] state    The new state of the surface
  *   \return              A wait handle that can be passed to mir_wait_for
  */
-MirWaitHandle* mir_surface_set_state(MirSurface *surface,
+MIR_API MirWaitHandle* mir_surface_set_state(MirSurface *surface,
                                      MirSurfaceState state);
 
 /**
@@ -224,7 +224,7 @@
  *   \param [in] surface  The surface to query
  *   \return              The state of the surface
  */
-MirSurfaceState mir_surface_get_state(MirSurface *surface);
+MIR_API MirSurfaceState mir_surface_get_state(MirSurface *surface);
 
 /**
  * Set the swapinterval for mir_surface_swap_buffers. EGL users should use
@@ -236,7 +236,7 @@
  *   \return              A wait handle that can be passed to mir_wait_for,
  *                        or NULL if the interval could not be supported
  */
-MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval);
+MIR_API MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval);
 
 /**
  * Query the swapinterval that the surface is operating with.
@@ -245,28 +245,28 @@
  *   \return              The swapinterval value that the client is operating with.
  *                        Returns -1 if surface is invalid.
  */
-int mir_surface_get_swapinterval(MirSurface* surface);
+MIR_API int mir_surface_get_swapinterval(MirSurface* surface);
 
 /**
  * Query the DPI value of the surface (dots per inch). This will vary depending
  * on the physical display configuration and where the surface is within it.
  *   \return  The DPI of the surface, or zero if unknown.
  */
-int mir_surface_get_dpi(MirSurface* surface);
+MIR_API int mir_surface_get_dpi(MirSurface* surface);
     
 /**
  * Query the focus state for a surface.
  *   \param [in] surface The surface to operate on
  *   \return             The focus state of said surface
  */
-MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface);
+MIR_API MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface);
 
 /**
  * Query the visibility state for a surface.
  *   \param [in] surface The surface to operate on
  *   \return             The visibility state of said surface
  */
-MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface);
+MIR_API MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface);
 
 /**
  * Choose the cursor state for a surface: whether a cursor is shown, 
@@ -278,14 +278,14 @@
  *                           or NULL if parameters is invalid.
  *
  */
-MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters);
+MIR_API MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters);
 
 /**
  * Get the orientation of a surface.
  *   \param [in] surface  The surface to query
  *   \return              The orientation of the surface
  */
-MirOrientation mir_surface_get_orientation(MirSurface *surface);
+MIR_API MirOrientation mir_surface_get_orientation(MirSurface *surface);
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_wait.h'
--- include/client/mir_toolkit/mir_wait.h	2014-03-31 14:36:08 +0000
+++ include/client/mir_toolkit/mir_wait.h	2014-07-22 03:06:31 +0000
@@ -35,7 +35,7 @@
  * have completed.
  *   \param [in] wait_handle  Handle returned by an asynchronous request
  */
-void mir_wait_for(MirWaitHandle *wait_handle);
+MIR_API void mir_wait_for(MirWaitHandle *wait_handle);
 
 /**
  * Wait on the supplied handle until one instance of the associated request
@@ -44,7 +44,7 @@
  * with the wait handle; only one.
  *   \param [in] wait_handle  Handle returned by an asynchronous request
  */
-void mir_wait_for_one(MirWaitHandle *wait_handle);
+MIR_API void mir_wait_for_one(MirWaitHandle *wait_handle);
 
 
 #ifdef __cplusplus

=== modified file 'include/shared/mir_toolkit/common.h'
--- include/shared/mir_toolkit/common.h	2014-07-21 15:42:04 +0000
+++ include/shared/mir_toolkit/common.h	2014-07-22 03:06:31 +0000
@@ -21,6 +21,11 @@
 #ifndef MIR_COMMON_H_
 #define MIR_COMMON_H_
 
+/**
+ * Used to mark an exported symbol
+ */
+#define MIR_API __attribute__((visibility("default")))
+
 #include <mir_toolkit/cursors.h>
 
 /**

=== modified file 'include/shared/mir_toolkit/cursors.h'
--- include/shared/mir_toolkit/cursors.h	2014-07-01 16:53:35 +0000
+++ include/shared/mir_toolkit/cursors.h	2014-07-22 03:06:31 +0000
@@ -21,6 +21,8 @@
 #ifndef MIR_CURSORS_H_
 #define MIR_CURSORS_H_
 
+#include "common.h"
+
 /**
  * \addtogroup mir_toolkit
  * @{
@@ -32,83 +34,83 @@
  * A special cursor name for use with mir_cursor_configuration_from_name
  * representing the system default cursor.
  */
-extern char const *const mir_default_cursor_name;
+MIR_API extern char const *const mir_default_cursor_name;
 /**
  * A special cursor name for use with mir_cursor_configuration_from_name
  * representing a disabled cursor image.
  */
-extern char const *const mir_disabled_cursor_name;
+MIR_API extern char const *const mir_disabled_cursor_name;
 
 /**
  * The standard arrow cursor (typically the system default)
  */
-extern char const* const mir_arrow_cursor_name;
+MIR_API extern char const* const mir_arrow_cursor_name;
 
 /**
  * The "wait" cursor, typically an hourglass or watch used during operations
  * which prevent the user from interacting.
  */
-extern char const* const mir_busy_cursor_name;
+MIR_API extern char const* const mir_busy_cursor_name;
 
 /**
  * The caret or ibeam cursor, indicating acceptance of text input
  */
-extern char const* const mir_caret_cursor_name;
+MIR_API extern char const* const mir_caret_cursor_name;
 
 /**
  * The pointing hand cursor, typically used for clickable elements such
  * as hyperlinks.
  */
-extern char const* const mir_pointing_hand_cursor_name;
+MIR_API extern char const* const mir_pointing_hand_cursor_name;
 
 /**
  * The open handed cursor, typically used to indicate that the area beneath
  * the cursor may be clicked and dragged around.
  */
-extern char const* const mir_open_hand_cursor_name;
+MIR_API extern char const* const mir_open_hand_cursor_name;
 
 /**
  * The close handed cursor, typically used to indicate that a drag operation is in process
  * which involves scrolling.
  */
-extern char const* const mir_closed_hand_cursor_name;
+MIR_API extern char const* const mir_closed_hand_cursor_name;
 
 /**
  * The cursor used to indicate a horizontal resize operation.
  */
-extern char const* const mir_horizontal_resize_cursor_name;
+MIR_API extern char const* const mir_horizontal_resize_cursor_name;
 
 /**
  * The cursor used to indicate a vertical resize operation.
  */
-extern char const* const mir_vertical_resize_cursor_name;
+MIR_API extern char const* const mir_vertical_resize_cursor_name;
 
 /**
  * The cursor used to indicate diagonal resize from top-right and bottom-left corners.
  */
-extern char const* const mir_diagonal_resize_bottom_to_top_cursor_name;
+MIR_API extern char const* const mir_diagonal_resize_bottom_to_top_cursor_name;
 
 /**
  * The cursor used to indicate diagonal resize from bottom-left and top-right corners.
  */
-extern char const* const mir_diagonal_resize_top_to_bottom_cursor_name;
+MIR_API extern char const* const mir_diagonal_resize_top_to_bottom_cursor_name;
 
 /**
  * The cursor used to indicate resize with no directional constraint.
  */
-extern char const* const mir_omnidirectional_resize_cursor_name;
+MIR_API extern char const* const mir_omnidirectional_resize_cursor_name;
 
 /**
  * The cursor used for vertical splitters, indicating that a handle may be
  * dragged to adjust vertical space.
  */
-extern char const* const mir_vsplit_resize_cursor_name;
+MIR_API extern char const* const mir_vsplit_resize_cursor_name;
 
 /**
  * The cursor used for horizontal splitters, indicating that a handle may be
  * dragged to adjust horizontal space.
  */
-extern char const* const mir_hsplit_resize_cursor_name;
+MIR_API extern char const* const mir_hsplit_resize_cursor_name;
 
 /**@}*/
 

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-07-16 03:38:05 +0000
+++ src/client/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -3,6 +3,8 @@
 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/mirclient")
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/mirclient.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
@@ -59,13 +61,21 @@
   ${CLIENT_SOURCES}
 )
 
+add_library(
+  mirclient-static
+
+  ${CLIENT_SOURCES}
+)
+
 set(MIRCLIENT_ABI 8)
+set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
 
 set_target_properties(
   mirclient
 
   PROPERTIES
   SOVERSION ${MIRCLIENT_ABI}
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
 set(
@@ -95,6 +105,12 @@
   ${MIR_CLIENT_LIBRARIES}
 )
 
+target_link_libraries(
+  mirclient-static
+
+  ${MIR_CLIENT_LIBRARIES}
+)
+
 install(
   TARGETS mirclient
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

=== modified file 'src/client/aging_buffer.h'
--- src/client/aging_buffer.h	2014-03-06 06:05:17 +0000
+++ src/client/aging_buffer.h	2014-07-22 03:06:31 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_CLIENT_AGING_BUFFER_H_
 #define MIR_CLIENT_AGING_BUFFER_H_
 
+#include "mir_toolkit/common.h"
 #include "client_buffer.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace client
 {
 
-class AgingBuffer : public ClientBuffer
+class MIR_API AgingBuffer : public ClientBuffer
 {
 public:
     AgingBuffer();

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-06-27 17:28:47 +0000
+++ src/client/android/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -1,8 +1,7 @@
 include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
 add_definitions(-DANDROID)
 
-add_library(
-  mirclientplatformandroid SHARED
+set(ANDROID_PLATFORM_SRC
 
   buffer.cpp
   android_client_buffer_factory.cpp
@@ -11,8 +10,15 @@
   client_platform_factory.cpp
   client_surface_interpreter.cpp
   android_native_display_container.cpp
+)  
+
+add_library(
+  mirclientplatformandroid SHARED
+
+  ${ANDROID_PLATFORM_SRC}
 )
 
+
 set_target_properties(
   mirclientplatformandroid PROPERTIES
   OUTPUT_NAME mirclientplatform
@@ -26,6 +32,26 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
+add_library(
+  mirclientplatformandroid-static STATIC
+
+  ${ANDROID_PLATFORM_SRC}
+)
+
+set_target_properties(
+  mirclientplatformandroid-static PROPERTIES
+  OUTPUT_NAME mirclientplatform-static
+  ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
+)
+
+target_link_libraries(
+  mirclientplatformandroid-static
+  mirclient
+
+  ${LIBHARDWARE_LIBRARIES}
+)
+
+
 install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
 
 if (MIR_TEST_PLATFORM STREQUAL "android")
@@ -35,6 +61,12 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+  add_custom_target(static-client-platform-symlink ALL
+    DEPENDS mirclientplatformandroid-static
+    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform-static.a
+    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid-static> libmirclientplatform-static.a
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
 
   install(CODE
     "execute_process(

=== modified file 'src/client/client_platform_factory.h'
--- src/client/client_platform_factory.h	2014-03-06 06:05:17 +0000
+++ src/client/client_platform_factory.h	2014-07-22 03:06:31 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_CLIENT_CLIENT_PLATFORM_FACTORY_H_
 #define MIR_CLIENT_CLIENT_PLATFORM_FACTORY_H_
 
+#include <mir_toolkit/common.h>
 #include <memory>
 
 namespace mir
@@ -42,7 +43,7 @@
 };
 
 extern "C" typedef std::shared_ptr<ClientPlatformFactory>(*CreateClientPlatformFactory)();
-extern "C" std::shared_ptr<ClientPlatformFactory> create_client_platform_factory();
+extern "C" MIR_API std::shared_ptr<ClientPlatformFactory> create_client_platform_factory();
 
 }
 }

=== modified file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	2014-03-06 06:05:17 +0000
+++ src/client/mesa/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -3,8 +3,7 @@
     ${EGL_INCLUDE_DIRS}
 )
 
-add_library(
-  mirclientplatformmesa SHARED
+set(MESA_PLATFORM_SRC
 
   client_platform_factory.cpp
   client_platform.cpp
@@ -12,6 +11,18 @@
   client_buffer.cpp
   mesa_native_display_container.cpp
   native_surface.cpp
+)  
+
+add_library(
+  mirclientplatformmesa SHARED
+
+  ${MESA_PLATFORM_SRC}
+)
+
+add_library(
+  mirclientplatformmesa-static STATIC
+
+  ${MESA_PLATFORM_SRC}
 )
 
 set_target_properties(
@@ -20,6 +31,12 @@
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
 )
 
+set_target_properties(
+  mirclientplatformmesa-static PROPERTIES
+  OUTPUT_NAME mirclientplatform-static
+  ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
+)
+
 target_link_libraries(
   mirclientplatformmesa
   mirclient
@@ -27,6 +44,13 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
+target_link_libraries(
+  mirclientplatformmesa-static
+  mirclient
+
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+)
+
 install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa")
@@ -36,6 +60,12 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+  add_custom_target(static-client-platform-symlink ALL
+    DEPENDS mirclientplatformmesa-static
+    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform-static.a
+    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa-static> libmirclientplatform-static.a
+    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+  )
 
   install(CODE
     "execute_process(

=== added file 'src/client/symbols.map'
--- src/client/symbols.map	1970-01-01 00:00:00 +0000
+++ src/client/symbols.map	2014-07-22 03:06:31 +0000
@@ -0,0 +1,14 @@
+MIR_CLIENT_0.6 {
+  global:
+    mir_*;
+    extern "C++" {
+      mir::client::AgingBuffer*;
+      typeinfo?for?mir::client::AgingBuffer*;
+      typeinfo?name?for?mir::client::AgingBuffer*;
+      VTT?for?mir::client::AgingBuffer*;
+      virtual?thunk?to?mir::client::AgingBuffer*;
+      vtable?for?mir::client::AgingBuffer*;
+    };
+  local:
+    *;
+};

=== modified file 'src/shared/logging/CMakeLists.txt'
--- src/shared/logging/CMakeLists.txt	2014-03-06 06:05:17 +0000
+++ src/shared/logging/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -14,7 +14,11 @@
 #
 # Authored by: Alexandros Frantzis <[e-mail]>
 
-add_library(mirsharedlogging STATIC
+set(MIR_SHARED_LOGGING_SOURCES
   dumb_console_logger.cpp
   input_timestamp.cpp
+)  
+
+add_library(mirsharedlogging STATIC
+  ${MIR_SHARED_LOGGING_SOURCES}
 )

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-07-17 05:11:57 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -63,7 +63,7 @@
   mir_acceptance_tests
 
   mirserver
-  mirclient
+  mirclient-static
   mirplatform
 
   mir-test

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-04-17 01:34:35 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -55,7 +55,7 @@
 
   mirserver
   mirplatformgraphics
-  mirclient
+  mirclient-static
   mirdraw
   mirtestdraw
 

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-07-11 21:53:44 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-07-22 03:06:31 +0000
@@ -43,10 +43,10 @@
 target_link_libraries(
   mir_unit_tests
 
-  mirclient
+  mirclient-static
   mirserver
   mirplatformgraphics
-  mirclientplatform
+  mirclientplatform-static
   mirdraw
   mirtestdraw
   mirlogging