[waffle] [PULL] nacl/header cleanups

Emil Velikov emil.l.velikov at gmail.com
Fri Apr 10 05:17:45 PDT 2015


Hi Chad,

Here is the "nacl-fixes" bunch which I've send earlier, with a follow up fix
(requested by Tapani) on top. I've rebased it (with virtually no changes) on
top of upstream/master to avoid git merge doing crazy on you :-)

-Emil


The following changes since commit 038b1dbc184054382bc89f197cf7c7811aeed5a3:

  Merge branch 'fjhenigman/platform_null' (2015-04-09 15:03:24 -0700)

are available in the git repository at:

  https://github.com/evelikov/waffle for-chad/nacl-fixes

for you to fetch changes up to 2e3ae6f2e24e92fffb0b45f11b90618a9b8c9a55:

  cgl,nacl: print the dlerror() when dlopen() fails (2015-04-10 11:58:42 +0100)

----------------------------------------------------------------
Emil Velikov (11):
      api/core: annotate structs/functions for C linkage
      nacl: move dlfcn.h inclusion to where it's needed
      nacl: move header inclusion outside of the extern "C" block
      nacl: rework nacl_dl functions
      nacl: emit errors when things fail
      nacl: use nacl_container prefix on relevant functions
      nacl: untangle header inclusions
      nacl: add missing pragma once guards
      android: remove no longer needed extern "C"
      android: add missing pragma once guard
      cgl,nacl: print the dlerror() when dlopen() fails

 src/waffle/CMakeLists.txt                       |   1 +
 src/waffle/android/droid_surfaceflingerlink.cpp |   2 -
 src/waffle/android/droid_surfaceflingerlink.h   |   2 +
 src/waffle/api/api_object.h                     |   8 +
 src/waffle/cgl/cgl_dl.m                         |   2 +-
 src/waffle/core/wcore_config.h                  |   8 +
 src/waffle/core/wcore_config_attrs.h            |   8 +
 src/waffle/core/wcore_display.h                 |   8 +
 src/waffle/core/wcore_error.h                   |   8 +
 src/waffle/core/wcore_util.h                    |   8 +
 src/waffle/nacl/nacl_config.c                   |   5 +-
 src/waffle/nacl/nacl_config.h                   |  11 ++
 src/waffle/nacl/nacl_container.cpp              |  24 +--
 src/waffle/nacl/nacl_container.h                |  24 +--
 src/waffle/nacl/nacl_context.c                  |  16 +-
 src/waffle/nacl/nacl_context.h                  |   5 +-
 src/waffle/nacl/nacl_display.c                  |   2 +
 src/waffle/nacl/nacl_display.h                  |   4 +-
 src/waffle/nacl/nacl_dl.c                       | 200 ++++++++++++++++++++++++
 src/waffle/nacl/nacl_dl.h                       |  43 +++++
 src/waffle/nacl/nacl_platform.c                 |  97 ++----------
 src/waffle/nacl/nacl_platform.h                 |   9 +-
 src/waffle/nacl/nacl_swap_thread.h              |   2 +
 src/waffle/nacl/nacl_window.c                   |  12 +-
 src/waffle/nacl/nacl_window.h                   |   4 +-
 25 files changed, 376 insertions(+), 137 deletions(-)
 create mode 100644 src/waffle/nacl/nacl_dl.c
 create mode 100644 src/waffle/nacl/nacl_dl.h



More information about the waffle mailing list