8000 remove unnecessary glib dependency #1120 · pythonnet/pythonnet@083d30f · GitHub
[go: up one dir, main page]
Skip to content

Commit 083d30f

Browse files
lostmsulostmsu
committed
remove unnecessary glib dependency #1120 
1 parent 92bc145 commit 083d30f

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

‎setup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,9 @@ def _build_monoclr(self):
398398
return
399399
raise
400400
mono_cflags = _check_output("pkg-config --cflags mono-2", shell=True)
401-
glib_libs = _check_output("pkg-config --libs glib-2.0", shell=True)
402-
glib_cflags = _check_output("pkg-config --cflags glib-2.0", shell=True)
403-
cflags = mono_cflags.strip() + " " + glib_cflags.strip()
404-
libs = mono_libs.strip() + " " + glib_libs.strip()
405-
401+
cflags = mono_cflags.strip()
402+
libs = mono_libs.strip()
403+
406404
# build the clr python module
407405
clr_ext = Extension(
408406
"clr",

‎src/monoclr/pynetclr.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <mono/metadata/mono-config.h>
88
#include <mono/metadata/debug-helpers.h>
99
#include <mono/metadata/assembly.h>
10-
#include <glib.h>
1110

1211
#define MONO_VERSION "v4.0.30319.1"
1312
#define MONO_DOMAIN "Python.Runtime"
@@ -27,7 +26,7 @@ typedef struct
2726

2827
PyNet_Args *PyNet_Init(int);
2928
void PyNet_Finalize(PyNet_Args *);
30-
void main_thread_handler(gpointer user_data);
29+
void main_thread_handler(PyNet_Args *user_data);
3130
char *PyNet_Exc A00D eptionToString(MonoObject *);
3231

3332
#endif // PYNET_CLR_H

‎src/monoclr/pynetinit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ MonoMethod *getMethodFromClass(MonoClass *cls, char *name)
9191
return method;
9292
}
9393

94-
void main_thread_handler(gpointer user_data)
94+
void main_thread_handler(PyNet_Args *user_data)
9595
{
96-
PyNet_Args *pn_args = (PyNet_Args *)user_data;
96+
PyNet_Args *pn_args = user_data;
9797
MonoMethod *init;
9898
MonoImage *pr_image;
9999
MonoClass *pythonengine;

0 commit comments

Comments
 (0)
0