forked from amazingfate/loongoffice
482d7ce61b
because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
91 lines
1.9 KiB
Diff
91 lines
1.9 KiB
Diff
--- include/epoxy/gl.h
|
|
+++ include/epoxy/gl.h
|
|
@@ -59,7 +59,8 @@
|
|
|
|
#else
|
|
#ifndef APIENTRY
|
|
-#define APIENTRY __stdcall
|
|
+#define WINAPI __stdcall
|
|
+#define APIENTRY WINAPI
|
|
#endif
|
|
|
|
#ifndef GLAPIENTRY
|
|
--- src/egl_generated_dispatch.c
|
|
+++ src/egl_generated_dispatch.c
|
|
@@ -128,7 +128,11 @@
|
|
};
|
|
|
|
#if USING_DISPATCH_TABLE
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void);
|
|
|
|
#endif
|
|
@@ -1642,7 +1646,11 @@
|
|
uint32_t egl_tls_index;
|
|
uint32_t egl_tls_size = sizeof(struct dispatch_table);
|
|
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void)
|
|
{
|
|
return TlsGetValue(egl_tls_index);
|
|
--- src/gl_generated_dispatch.c
|
|
+++ src/gl_generated_dispatch.c
|
|
@@ -3122,7 +3122,11 @@
|
|
};
|
|
|
|
#if USING_DISPATCH_TABLE
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void);
|
|
|
|
#endif
|
|
@@ -51507,7 +51511,11 @@
|
|
uint32_t gl_tls_index;
|
|
uint32_t gl_tls_size = sizeof(struct dispatch_table);
|
|
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void)
|
|
{
|
|
return TlsGetValue(gl_tls_index);
|
|
--- src/wgl_generated_dispatch.c
|
|
+++ src/wgl_generated_dispatch.c
|
|
@@ -157,7 +157,11 @@
|
|
};
|
|
|
|
#if USING_DISPATCH_TABLE
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void);
|
|
|
|
#endif
|
|
@@ -1701,7 +1705,11 @@
|
|
uint32_t wgl_tls_index;
|
|
uint32_t wgl_tls_size = sizeof(struct dispatch_table);
|
|
|
|
+#if defined (_MSC_VER)
|
|
+static __inline struct dispatch_table *
|
|
+#else
|
|
static inline struct dispatch_table *
|
|
+#endif
|
|
get_dispatch_table(void)
|
|
{
|
|
return TlsGetValue(wgl_tls_index);
|