Commit 544714787cfcf92285f74538211240dd4666ca6b
2024-03-11T16:41:49
win32
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/ic3/buf_wineditline.c b/ic3/buf_wineditline.c
index f2dd205..32fccc4 100644
--- a/ic3/buf_wineditline.c
+++ b/ic3/buf_wineditline.c
@@ -18,15 +18,15 @@
#include "../libc3/c3.h"
typedef struct buf_wineditline {
- s_buf buf;
- bool eof;
- const s8 *prompt;
+ s_buf buf;
+ bool eof;
+ const char *prompt;
} s_buf_wineditline;
sw buf_wineditline_refill_fgets (s_buf *buf);
sw buf_wineditline_refill_wineditline (s_buf *buf);
-void buf_wineditline_close (s_buf *buf, const s8 *history_path)
+void buf_wineditline_close (s_buf *buf, const char *history_path)
{
assert(buf);
if (history_path)
@@ -38,8 +38,8 @@ void buf_wineditline_close (s_buf *buf, const s8 *history_path)
puts("");
}
-s_buf * buf_wineditline_open_r (s_buf *buf, const s8 *prompt,
- const s8 *history_path)
+s_buf * buf_wineditline_open_r (s_buf *buf, const char *prompt,
+ const char *history_path)
{
s_buf_wineditline *buf_wineditline;
assert(buf);
diff --git a/ic3/buf_wineditline.h b/ic3/buf_wineditline.h
index 3332f36..f2d3274 100644
--- a/ic3/buf_wineditline.h
+++ b/ic3/buf_wineditline.h
@@ -17,8 +17,8 @@
#ifndef IC3_BUF_WINEDITLINE_H
#define IC3_BUF_WINEDITLINE_H
-void buf_wineditline_close (s_buf *buf, const s8 *history_path);
-s_buf * buf_wineditline_open_r (s_buf *buf, const s8 *prompt,
- const s8 *history_path);
+void buf_wineditline_close (s_buf *buf, const char *history_path);
+s_buf * buf_wineditline_open_r (s_buf *buf, const char *prompt,
+ const char *history_path);
#endif /* IC3_BUF_WINEDITLINE_H */
diff --git a/libc3/window/cairo/win32/window_cairo_win32.c b/libc3/window/cairo/win32/window_cairo_win32.c
index 75d8801..09d0e70 100644
--- a/libc3/window/cairo/win32/window_cairo_win32.c
+++ b/libc3/window/cairo/win32/window_cairo_win32.c
@@ -62,7 +62,8 @@ LRESULT CALLBACK window_cairo_win32_proc (HWND hwnd, UINT message,
SelectObject(buffer_hdc, buffer_hbitmap);
surface = cairo_win32_surface_create(buffer_hdc);
cr = cairo_create(surface);
- if (! window->render(window, cr)) {
+ window->cr = cr;
+ if (! window->render(window)) {
printf("render -> false\n");
PostQuitMessage(1);
}
diff --git a/libc3/window/sdl2/window_sdl2.c b/libc3/window/sdl2/window_sdl2.c
index dd830d4..15e6ad1 100644
--- a/libc3/window/sdl2/window_sdl2.c
+++ b/libc3/window/sdl2/window_sdl2.c
@@ -204,7 +204,7 @@ bool window_sdl2_run (s_window_sdl2 *window)
}
if (glDebugMessageCallback) {
glEnable(GL_DEBUG_OUTPUT);
- glDebugMessageCallback(gl_debug, NULL);
+ glDebugMessageCallback((GLDEBUGPROC) gl_debug, NULL);
}
if (SDL_GL_MakeCurrent(sdl_window, context) < 0) {
warnx("window_sdl2_run: failed to make OpenGL context current: %s",