Check-in [a5d3b172d5]
Overview
SHA1:a5d3b172d5ded338b742241e3bf41cd3268ea015
Date: 2016-03-20 08:23:54
User: rkeene
Comment:Better attempt at handling dlclose() on Win32 for static builds
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2016-03-20
08:39
[63577d4012] tcc4tcl 0.25 (user: rkeene, tags: trunk, 0.25)
08:23
[a5d3b172d5] Better attempt at handling dlclose() on Win32 for static builds (user: rkeene, tags: trunk)
07:51
[04e5469fb6] tcc4tcl 0.24 (user: rkeene, tags: trunk, 0.24)
Changes

Modified build/tcc-patches/0.9.26/tcc-0.9.26-dlopenoptional.diff from [0780fc4d9c] to [438169d89a].

1
2
3
4
5
6
7
8
9



10
11
12
13

14

15
16
17
18
19
20
21
diff -uNr tcc-0.9.26.orig/libtcc.c tcc-0.9.26-1dlopenoptional/libtcc.c
--- tcc-0.9.26.orig/libtcc.c	2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1dlopenoptional/libtcc.c	2016-03-20 02:48:46.246782000 -0500
@@ -114,8 +114,8 @@
 }
 #endif
 
-#ifndef CONFIG_TCC_STATIC
-void dlclose(void *p)



+#if !defined(CONFIG_TCC_STATIC) || (defined(CONFIG_TCC_STATIC) && defined(CONFIG_TCC_STATIC_NODLOPEN))
+static void dlclose(void *p)
 {
     FreeLibrary((HMODULE)p);

 }

diff -uNr tcc-0.9.26.orig/tccrun.c tcc-0.9.26-1dlopenoptional/tccrun.c
--- tcc-0.9.26.orig/tccrun.c	2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1dlopenoptional/tccrun.c	2014-05-21 23:33:35.056517000 -0500
@@ -674,6 +674,7 @@
 /* ------------------------------------------------------------- */
 #ifdef CONFIG_TCC_STATIC
 


|
|





>
>
>

|
<
|
>
|
>







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
diff -uNr tcc-0.9.26.orig/libtcc.c tcc-0.9.26-1dlopenoptional/libtcc.c
--- tcc-0.9.26.orig/libtcc.c	2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1dlopenoptional/libtcc.c	2016-03-20 03:08:47.546782000 -0500
@@ -114,11 +114,9 @@
 }
 #endif
 
-#ifndef CONFIG_TCC_STATIC
-void dlclose(void *p)
-{
-    FreeLibrary((HMODULE)p);
-}
+#if !defined(CONFIG_TCC_STATIC) || (defined(CONFIG_TCC_STATIC) && defined(CONFIG_TCC_STATIC_NODLOPEN))
+#undef dlclose

+#define dlclose(p) FreeLibrary((HMODULE)p)
 #endif
 
 #ifdef LIBTCC_AS_DLL
diff -uNr tcc-0.9.26.orig/tccrun.c tcc-0.9.26-1dlopenoptional/tccrun.c
--- tcc-0.9.26.orig/tccrun.c	2013-02-15 08:24:00.000000000 -0600
+++ tcc-0.9.26-1dlopenoptional/tccrun.c	2014-05-21 23:33:35.056517000 -0500
@@ -674,6 +674,7 @@
 /* ------------------------------------------------------------- */
 #ifdef CONFIG_TCC_STATIC