diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:12 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:12 -0700 |
| commit | 7420e46a354ca3e161b780bfa78f2f1ca162d13d (patch) | |
| tree | a08a01e9e71efa939d4744910fa982ff3b89c3b0 /oscl | |
| parent | a0b18db46c35da70ba90fc481ec56e0d6a5e8c92 (diff) | |
| download | opencore-7420e46a354ca3e161b780bfa78f2f1ca162d13d.tar.gz | |
auto import from //branches/cupcake/...@137197
Diffstat (limited to 'oscl')
| -rw-r--r-- | oscl/oscl/config/linux_nj/osclconfig.h | 4 | ||||
| -rw-r--r-- | oscl/oscl/oscllib/src/oscl_shared_lib_interface.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/oscl/oscl/config/linux_nj/osclconfig.h b/oscl/oscl/config/linux_nj/osclconfig.h index 08dcf701d..3eee50543 100644 --- a/oscl/oscl/config/linux_nj/osclconfig.h +++ b/oscl/oscl/config/linux_nj/osclconfig.h @@ -35,9 +35,7 @@ #include <dirent.h> #include <dlfcn.h> - - -#define HAS_OSCL_LIB_SUPPORT 1 +// HAS_OSCL_LIB_SUPPORT is now defined in the build environment. // include common include for determining sizes from limits.h #include "osclconfig_limits_typedefs.h" diff --git a/oscl/oscl/oscllib/src/oscl_shared_lib_interface.h b/oscl/oscl/oscllib/src/oscl_shared_lib_interface.h index f586d7c1b..3d74e2183 100644 --- a/oscl/oscl/oscllib/src/oscl_shared_lib_interface.h +++ b/oscl/oscl/oscllib/src/oscl_shared_lib_interface.h @@ -22,10 +22,15 @@ #include "oscl_uuid.h" #endif +#ifndef HAS_OSCL_LIB_SUPPORT +// A file is trying to use the OSCL dynamic loader but its support has been +// turned off by the build environment. +#error "OSCL shared library used but HAS_OSCL_LIB_SUPPORT is undef." +#endif + class OsclSharedLibraryInterface { public: virtual OsclAny* SharedLibraryLookup(const OsclUuid& aInterfaceId) = 0; }; #endif // OSCL_SHARED_LIB_INTERFACE_H_INCLUDED - |