Mercurial > octave
comparison liboctave/util/lo-cutils.c @ 21236:5d23ea5c733a
eliminate configuration macros from lo-cutils.h
* lo-cutils.h, lo-cutils.c (octave_w32_library_search): Delete.
Don't include windows.h
* oct-shlib.cc: (octave_w32_library_search): Delete extern decl.
(octave_w32_shlib::octave_w32_shlib): Declare msg as const char*.
(octave_w32_shlib::search): Call GetProcAddress directly.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Feb 2016 13:37:25 -0500 |
parents | f7d1050b9b53 |
children | 40de9f8f23a6 |
comparison
equal
deleted
inserted
replaced
21234:20a824cd1d9e | 21236:5d23ea5c733a |
---|---|
59 OCTAVE_API int | 59 OCTAVE_API int |
60 octave_strncasecmp (const char *s1, const char *s2, size_t n) | 60 octave_strncasecmp (const char *s1, const char *s2, size_t n) |
61 { | 61 { |
62 return strncasecmp (s1, s2, n); | 62 return strncasecmp (s1, s2, n); |
63 } | 63 } |
64 | |
65 #ifdef HAVE_LOADLIBRARY_API | |
66 # include <windows.h> | |
67 | |
68 /* Need this since in C++ can't cast from int(*)() to void* */ | |
69 OCTAVE_API void * | |
70 octave_w32_library_search (HINSTANCE handle, const char * name) | |
71 { | |
72 return (GetProcAddress (handle, name)); | |
73 } | |
74 #endif | |
75 | 64 |
76 OCTAVE_API pid_t | 65 OCTAVE_API pid_t |
77 octave_waitpid (pid_t pid, int *status, int options) | 66 octave_waitpid (pid_t pid, int *status, int options) |
78 { | 67 { |
79 return WAITPID (pid, status, options); | 68 return WAITPID (pid, status, options); |