wxColour source cleaning. Corrections to 'const unsigned char' within wxColour docs.

[wxWidgets.git] / src / unix / dlunix.cpp

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 21b00d22a8bae6fcb698f3966767afccdb0f8eed..5dc05dd27967f62a6030c3a8887728bbc724434e 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef RTLD_GLOBAL
 #endif
 
 #ifndef RTLD_GLOBAL

-    #define RTLD_GLOBAL
+    #define RTLD_GLOBAL 0

 #endif
 
 
 #endif
 
 


@@ -102,7 +102,7 @@ static
 void TranslateError(const char *path, int number)
 {
     unsigned int index;
 void TranslateError(const char *path, int number)
 {
     unsigned int index;

-    static char *OFIErrorStrings[] =
+    static const char *OFIErrorStrings[] =

     {
         "%s(%d): Object Image Load Failure\n",
         "%s(%d): Object Image Load Success\n",
     {
         "%s(%d): Object Image Load Failure\n",
         "%s(%d): Object Image Load Success\n",


@@ -110,7 +110,7 @@ void TranslateError(const char *path, int number)
         "%s(%d): No valid architecture\n",
         "%s(%d): Object image has an invalid format\n",
         "%s(%d): Invalid access (permissions?)\n",
         "%s(%d): No valid architecture\n",
         "%s(%d): Object image has an invalid format\n",
         "%s(%d): Invalid access (permissions?)\n",

-        "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
+        "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n"

     };
 #define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
 
     };
 #define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
 


@@ -155,7 +155,7 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
 
 int dlclose(void *handle)
 {
 
 int dlclose(void *handle)
 {

-    NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);
+    NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE);

     return 0;
 }
 
     return 0;
 }
 


@@ -169,7 +169,7 @@ void *dlsym(void *handle, const char *symbol)
     p[0] = '_';
     strcpy(p + 1, symbol);
 
     p[0] = '_';
     strcpy(p + 1, symbol);
 

-    NSSymbol nsSymbol = NSLookupSymbolInModule( handle, p );
+    NSSymbol nsSymbol = NSLookupSymbolInModule((NSModule)handle, p );

     return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
 }
 
     return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
 }
 


@@ -191,24 +191,17 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 /* static */
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {
 /* static */
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {

-    wxASSERT_MSG( (flags & wxDL_NOW) == 0,
+    wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY),

                   _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
 
 #ifdef USE_POSIX_DL_FUNCS
                   _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
 
 #ifdef USE_POSIX_DL_FUNCS

-    int rtldFlags = 0;
+    // we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen()
+    // with flags == 0 recent versions of glibc just fail the call, so use
+    // RTLD_NOW even if wxDL_NOW was not specified
+    int rtldFlags = flags & wxDL_LAZY ? RTLD_LAZY : RTLD_NOW;

 
 

-    if ( flags & wxDL_LAZY )
-    {
-        rtldFlags |= RTLD_LAZY;
-    }
-    if ( flags & wxDL_NOW )
-    {
-        rtldFlags |= RTLD_NOW;
-    }

     if ( flags & wxDL_GLOBAL )
     if ( flags & wxDL_GLOBAL )

-    {

         rtldFlags |= RTLD_GLOBAL;
         rtldFlags |= RTLD_GLOBAL;

-    }

 
     return dlopen(libname.fn_str(), rtldFlags);
 #else // !USE_POSIX_DL_FUNCS
 
     return dlopen(libname.fn_str(), rtldFlags);
 #else // !USE_POSIX_DL_FUNCS


@@ -300,7 +293,7 @@ public:
         wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
         details->m_path = path;
         details->m_name = path.AfterLast(_T('/'));
         wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
         details->m_path = path;
         details->m_name = path.AfterLast(_T('/'));

-        details->m_address = wx_reinterpret_cast(void *, start);
+        details->m_address = wxUIntToPtr(start);

         details->m_length = end - start;
 
         // try to extract the library version from its name
         details->m_length = end - start;
 
         // try to extract the library version from its name


@@ -340,8 +333,8 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
     {
         // details of the module currently being parsed
         wxString pathCur;
     {
         // details of the module currently being parsed
         wxString pathCur;

-        unsigned long startCur,
-                      endCur;
+        unsigned long startCur = 0,
+                      endCur = 0;

 
         char path[1024];
         char buf[1024];
 
         char path[1024];
         char buf[1024];