Mercurial > hg > xemacs-beta
comparison src/sysdll.c @ 4834:b3ea9c582280
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Tue, 12 Jan 2010 01:38:04 -0600 |
parents | 5989b9bbb612 |
children | 19a72041c5ed |
comparison
equal
deleted
inserted
replaced
4833:4dd2389173fc | 4834:b3ea9c582280 |
---|---|
107 #elif defined(HAVE__DLERROR) | 107 #elif defined(HAVE__DLERROR) |
108 msg = (const Extbyte *) _dlerror(); | 108 msg = (const Extbyte *) _dlerror(); |
109 #else | 109 #else |
110 msg = (const Extbyte *) "Shared library error"; | 110 msg = (const Extbyte *) "Shared library error"; |
111 #endif | 111 #endif |
112 return build_ext_string (msg, Qnative); | 112 return build_ext_string (msg, Qerror_message_encoding); |
113 } | 113 } |
114 | 114 |
115 #elif defined(HAVE_SHL_LOAD) | 115 #elif defined(HAVE_SHL_LOAD) |
116 /* This is the HP/UX version */ | 116 /* This is the HP/UX version */ |
117 #include <dl.h> | 117 #include <dl.h> |
162 Lisp_Object | 162 Lisp_Object |
163 dll_error () | 163 dll_error () |
164 { | 164 { |
165 /* #### WTF?! Shouldn't this at least attempt to get strerror or | 165 /* #### WTF?! Shouldn't this at least attempt to get strerror or |
166 something? --hniksic */ | 166 something? --hniksic */ |
167 return build_string ("Generic shared library error", Qnative); | 167 return build_string ("Generic shared library error", |
168 Qerror_message_encoding); | |
168 } | 169 } |
169 | 170 |
170 #elif defined (WIN32_NATIVE) || defined (CYGWIN) | 171 #elif defined (WIN32_NATIVE) || defined (CYGWIN) |
171 | 172 |
172 #include "syswindows.h" | 173 #include "syswindows.h" |
181 { | 182 { |
182 soname = NULL; | 183 soname = NULL; |
183 } | 184 } |
184 else | 185 else |
185 { | 186 { |
186 LOCAL_FILE_FORMAT_TO_TSTR (fname, soname); | 187 LISP_LOCAL_FILE_FORMAT_TO_TSTR (fname, soname); |
187 } | 188 } |
188 return (dll_handle) qxeLoadLibrary (soname); | 189 return (dll_handle) qxeLoadLibrary (soname); |
189 } | 190 } |
190 | 191 |
191 int | 192 int |
429 { | 430 { |
430 NSLinkEditErrors c; | 431 NSLinkEditErrors c; |
431 int errorNumber; | 432 int errorNumber; |
432 const CIbyte *fileNameWithError, *errorString; | 433 const CIbyte *fileNameWithError, *errorString; |
433 NSLinkEditError(&c, &errorNumber, &fileNameWithError, &errorString); | 434 NSLinkEditError(&c, &errorNumber, &fileNameWithError, &errorString); |
434 return build_ext_string (errorString, Qnative); | 435 return build_ext_string (errorString, Qerror_message_encoding); |
435 } | 436 } |
436 #elif HAVE_LTDL | 437 #elif HAVE_LTDL |
437 /* Libtool's libltdl */ | 438 /* Libtool's libltdl */ |
438 #include <ltdl.h> | 439 #include <ltdl.h> |
439 | 440 |
474 } | 475 } |
475 | 476 |
476 Lisp_Object | 477 Lisp_Object |
477 dll_error () | 478 dll_error () |
478 { | 479 { |
479 return build_ext_string (lt_dlerror (), Qnative); | 480 return build_ext_string (lt_dlerror (), Qerror_message_encoding); |
480 } | 481 } |
481 #else | 482 #else |
482 /* Catchall if we don't know about this system's method of dynamic loading */ | 483 /* Catchall if we don't know about this system's method of dynamic loading */ |
483 dll_handle | 484 dll_handle |
484 dll_open (Lisp_Object fname) | 485 dll_open (Lisp_Object fname) |