From 8030542e9c1262d11845ef19c8b6f0b441d9baa4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 21 Mar 2002 05:31:36 +0000 Subject: [PATCH] r1598: Added Win32/DLL compatibility --- examples/.cvsignore | 3 +++ examples/Makefile.nt | 7 +++++++ examples/c-test-fns.c | 27 ++++++++++++++++----------- tests/.cvsignore | 3 +++ tests/Makefile.nt | 7 +++++++ tests/c-test-fns.c | 27 ++++++++++++++++----------- 6 files changed, 52 insertions(+), 22 deletions(-) create mode 100755 examples/.cvsignore create mode 100644 examples/Makefile.nt create mode 100755 tests/.cvsignore create mode 100644 tests/Makefile.nt diff --git a/examples/.cvsignore b/examples/.cvsignore new file mode 100755 index 0000000..0411d27 --- /dev/null +++ b/examples/.cvsignore @@ -0,0 +1,3 @@ +c-test-fns.lib +c-test-fns.dll + diff --git a/examples/Makefile.nt b/examples/Makefile.nt new file mode 100644 index 0000000..3358b6c --- /dev/null +++ b/examples/Makefile.nt @@ -0,0 +1,7 @@ +c-test-fns.dll: c-test-fns.c + cl /LD /DWIN32=1 c-test-fns.c + del c-test-fns.obj + +clean: + del /q c-test-fns.obj c-test-fns.dll + diff --git a/examples/c-test-fns.c b/examples/c-test-fns.c index 05244b8..7358114 100644 --- a/examples/c-test-fns.c +++ b/examples/c-test-fns.c @@ -6,7 +6,7 @@ * Programer: Kevin M. Rosenberg * Date Started: Mar 2002 * - * CVS Id: $Id: c-test-fns.c,v 1.2 2002/03/21 04:04:45 kevin Exp $ + * CVS Id: $Id: c-test-fns.c,v 1.3 2002/03/21 05:29:57 kevin Exp $ * * This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg * @@ -20,17 +20,26 @@ #ifdef WIN32 #include + +BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, + DWORD fdwReason, + LPVOID lpvReserved) +{ + return 1; +} + +#define DLLEXPORT __declspec(dllexport) + +#else +#define DLLEXPORT #endif #include #include - /* Test of constant input string */ +DLLEXPORT int -#ifdef WIN32 -WINAPI -#endif cs_count_upper (char* psz) { int count = 0; @@ -47,10 +56,8 @@ cs_count_upper (char* psz) } /* Test of input and output of a string */ +DLLEXPORT void -#ifdef WIN32 -WINAPI -#endif cs_to_upper (char* psz) { if (psz) { @@ -62,10 +69,8 @@ cs_to_upper (char* psz) } /* Test of an output only string */ +DLLEXPORT void -#ifdef WIN32 -WINAPI -#endif cs_make_random (int size, char* buffer) { int i; diff --git a/tests/.cvsignore b/tests/.cvsignore new file mode 100755 index 0000000..0411d27 --- /dev/null +++ b/tests/.cvsignore @@ -0,0 +1,3 @@ +c-test-fns.lib +c-test-fns.dll + diff --git a/tests/Makefile.nt b/tests/Makefile.nt new file mode 100644 index 0000000..3358b6c --- /dev/null +++ b/tests/Makefile.nt @@ -0,0 +1,7 @@ +c-test-fns.dll: c-test-fns.c + cl /LD /DWIN32=1 c-test-fns.c + del c-test-fns.obj + +clean: + del /q c-test-fns.obj c-test-fns.dll + diff --git a/tests/c-test-fns.c b/tests/c-test-fns.c index 05244b8..7358114 100644 --- a/tests/c-test-fns.c +++ b/tests/c-test-fns.c @@ -6,7 +6,7 @@ * Programer: Kevin M. Rosenberg * Date Started: Mar 2002 * - * CVS Id: $Id: c-test-fns.c,v 1.2 2002/03/21 04:04:45 kevin Exp $ + * CVS Id: $Id: c-test-fns.c,v 1.3 2002/03/21 05:29:57 kevin Exp $ * * This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg * @@ -20,17 +20,26 @@ #ifdef WIN32 #include + +BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, + DWORD fdwReason, + LPVOID lpvReserved) +{ + return 1; +} + +#define DLLEXPORT __declspec(dllexport) + +#else +#define DLLEXPORT #endif #include #include - /* Test of constant input string */ +DLLEXPORT int -#ifdef WIN32 -WINAPI -#endif cs_count_upper (char* psz) { int count = 0; @@ -47,10 +56,8 @@ cs_count_upper (char* psz) } /* Test of input and output of a string */ +DLLEXPORT void -#ifdef WIN32 -WINAPI -#endif cs_to_upper (char* psz) { if (psz) { @@ -62,10 +69,8 @@ cs_to_upper (char* psz) } /* Test of an output only string */ +DLLEXPORT void -#ifdef WIN32 -WINAPI -#endif cs_make_random (int size, char* buffer) { int i; -- 2.34.1