Mercurial > octave
comparison liboctave/util/lo-cutils.h @ 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 | 1473547f50f5 |
comparison
equal
deleted
inserted
replaced
21234:20a824cd1d9e | 21236:5d23ea5c733a |
---|---|
23 #if ! defined (octave_lo_cutils_h) | 23 #if ! defined (octave_lo_cutils_h) |
24 #define octave_lo_cutils_h 1 | 24 #define octave_lo_cutils_h 1 |
25 | 25 |
26 #include <sys/types.h> | 26 #include <sys/types.h> |
27 | 27 |
28 #ifdef HAVE_LOADLIBRARY_API | |
29 # define WIN32_LEAN_AND_MEAN 1 | |
30 # include <windows.h> | |
31 #endif | |
32 | |
33 #ifdef __cplusplus | 28 #ifdef __cplusplus |
34 extern "C" { | 29 extern "C" { |
35 #endif | 30 #endif |
36 | 31 |
37 OCTAVE_API void | 32 OCTAVE_API void |
41 OCTAVE_API int | 36 OCTAVE_API int |
42 octave_strcasecmp (const char *s1, const char *s2); | 37 octave_strcasecmp (const char *s1, const char *s2); |
43 | 38 |
44 OCTAVE_API int | 39 OCTAVE_API int |
45 octave_strncasecmp (const char *s1, const char *s2, size_t n); | 40 octave_strncasecmp (const char *s1, const char *s2, size_t n); |
46 | |
47 #ifdef HAVE_LOADLIBRARY_API | |
48 OCTAVE_API void * | |
49 octave_w32_library_search (HINSTANCE handle, const char *name); | |
50 #endif | |
51 | 41 |
52 OCTAVE_API pid_t | 42 OCTAVE_API pid_t |
53 octave_waitpid (pid_t pid, int *status, int options); | 43 octave_waitpid (pid_t pid, int *status, int options); |
54 | 44 |
55 OCTAVE_API int octave_wifexited (int status); | 45 OCTAVE_API int octave_wifexited (int status); |