Rein in unintended external functions on Windows.

Jean-Claude Beaudoin committed 10 years ago

Commit 889ee281 parent 08335c14 files · +7 −5Browse files

Unified · Split

4 files

libtcc.c +2 −2
tcc.h +1 −1
tccpe.c +2 −0
win32/tools/tiny_impdef.c +2 −2

@@ -117,7 +117,7 @@ static void tcc_add_systemdir(TCCState *s) · 116 unmodified lines
117	117	#endif
118	118
119	119	#ifndef CONFIG_TCC_STATIC
120		−void dlclose(void *p)
	120	+static void dlclose(void *p)
121	121	{
122	122	FreeLibrary((HMODULE)p);
123	123	}
@@ -135,7 +135,7 @@ BOOL WINAPI DllMain (HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) · 11 unmodified lines
135	135
136	136	/********************************************************/
137	137	/* copy a string and truncate it. */
138		−PUB_FUNC char pstrcpy(char buf, int buf_size, const char *s)
	138	+ST_FUNC char pstrcpy(char buf, int buf_size, const char *s)
139	139	{
140	140	char q, q_end;
141	141	int c;

tcc.h+1−1

@@ -1167,7 +1167,7 @@ ST_DATA struct TCCState *tcc_state; · 1166 unmodified lines
1167	1167	#define AFF_PREPROCESS 0x0004 /* preprocess file */
1168	1168
1169	1169	/* public functions currently used by the tcc main function */
1170		−PUB_FUNC char pstrcpy(char buf, int buf_size, const char *s);
	1170	+ST_FUNC char pstrcpy(char buf, int buf_size, const char *s);
1171	1171	ST_FUNC char pstrcat(char buf, int buf_size, const char *s);
1172	1172	ST_FUNC char pstrncpy(char out, const char *in, size_t num);
1173	1173	PUB_FUNC char tcc_basename(const char name);

@@ -58,6 +58,7 @@ · 57 unmodified lines
58	58
59	59	#endif
60	60
	61	+#if 0
61	62	#ifdef _WIN32
62	63	void dbg_printf (const char *fmt, ...)
63	64	{
@@ -70,6 +71,7 @@ void dbg_printf (const char *fmt, ...) · 6 unmodified lines
70	71	OutputDebugString(buffer);
71	72	}
72	73	#endif
	74	+#endif
73	75
74	76	/* ----------------------------------------------------------- */
75	77	#ifndef IMAGE_NT_SIGNATURE

win32/tools/tiny_impdef.c+2−2

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	28	#include <io.h>
29	29	#include <malloc.h>
30	30
31		−char *get_export_names(int fd);
	31	+static char *get_export_names(int fd);
32	32	#define tcc_free free
33	33	#define tcc_realloc realloc
34	34
@@ -169,7 +169,7 @@ int read_mem(int fd, unsigned offset, void *buffer, unsigned len) · 134 unmodified lines
169	169	/* -------------------------------------------------------------- */
170	170	#endif
171	171
172		−char *get_export_names(int fd)
	172	+static char *get_export_names(int fd)
173	173	{
174	174	int l, i, n, n0;
175	175	char *p;