Define KEY_WOW64_64KEY if it is missing from SDK headers.

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

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 4e2d7553dcc27fb64f191c6b946abc03afada10e..413c51201de50079e484ce01210eeadd0373365d 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -116,7 +116,7 @@ static void *wx_darwin_dlopen(const char *path, int WXUNUSED(mode) /* mode is ig
     {
         handle = NULL;
 
     {
         handle = NULL;
 

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

         {
             "%d: Object Image Load Failure",
             "%d: Object Image Load Success",
         {
             "%d: Object Image Load Failure",
             "%d: Object Image Load Success",


@@ -256,7 +256,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {
     wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY),
 wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {
     wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY),

-                  _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
+                  wxT("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );

 
 #ifdef USE_POSIX_DL_FUNCS
     // we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen()
 
 #ifdef USE_POSIX_DL_FUNCS
     // we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen()


@@ -354,22 +354,22 @@ public:
     {
         wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
         details->m_path = path;
     {
         wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
         details->m_path = path;

-        details->m_name = path.AfterLast(_T('/'));
+        details->m_name = path.AfterLast(wxT('/'));

         details->m_address = start;
         details->m_length = (char *)end - (char *)start;
 
         // try to extract the library version from its name
         details->m_address = start;
         details->m_length = (char *)end - (char *)start;
 
         // try to extract the library version from its name

-        const size_t posExt = path.rfind(_T(".so"));
+        const size_t posExt = path.rfind(wxT(".so"));

         if ( posExt != wxString::npos )
         {
         if ( posExt != wxString::npos )
         {

-            if ( path.c_str()[posExt + 3] == _T('.') )
+            if ( path.c_str()[posExt + 3] == wxT('.') )

             {
                 // assume "libfoo.so.x.y.z" case
                 details->m_version.assign(path, posExt + 4, wxString::npos);
             }
             else
             {
             {
                 // assume "libfoo.so.x.y.z" case
                 details->m_version.assign(path, posExt + 4, wxString::npos);
             }
             else
             {

-                size_t posDash = path.find_last_of(_T('-'), posExt);
+                size_t posDash = path.find_last_of(wxT('-'), posExt);

                 if ( posDash != wxString::npos )
                 {
                     // assume "libbar-x.y.z.so" case
                 if ( posDash != wxString::npos )
                 {
                     // assume "libbar-x.y.z.so" case


@@ -390,7 +390,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
 
 #ifdef __LINUX__
     // examine /proc/self/maps to find out what is loaded in our address space
 
 #ifdef __LINUX__
     // examine /proc/self/maps to find out what is loaded in our address space

-    wxFFile file(_T("/proc/self/maps"));
+    wxFFile file(wxT("/proc/self/maps"));

     if ( file.IsOpened() )
     {
         // details of the module currently being parsed
     if ( file.IsOpened() )
     {
         // details of the module currently being parsed


@@ -420,13 +420,13 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
                 default:
                     // chop '\n'
                     buf[strlen(buf) - 1] = '\0';
                 default:
                     // chop '\n'
                     buf[strlen(buf) - 1] = '\0';

-                    wxLogDebug(_T("Failed to parse line \"%s\" in /proc/self/maps."),
+                    wxLogDebug(wxT("Failed to parse line \"%s\" in /proc/self/maps."),

                                buf);
                     continue;
             }
 
             wxASSERT_MSG( start >= endCur,
                                buf);
                     continue;
             }
 
             wxASSERT_MSG( start >= endCur,

-                          _T("overlapping regions in /proc/self/maps?") );
+                          wxT("overlapping regions in /proc/self/maps?") );

 
             wxString pathNew = wxString::FromAscii(path);
             if ( pathCur.empty() )
 
             wxString pathNew = wxString::FromAscii(path);
             if ( pathCur.empty() )