From: Kevin M. Rosenberg Date: Wed, 8 Jun 2005 19:38:14 +0000 (+0000) Subject: r10578: rename foreign library X-Git-Tag: v3.8.6~140 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=473fb1cce3125859074ac32c2c1ba4eb25cdfb74 r10578: rename foreign library --- diff --git a/uffi/Makefile b/uffi/Makefile index 0a0568f..a040b4d 100644 --- a/uffi/Makefile +++ b/uffi/Makefile @@ -17,7 +17,7 @@ SUBDIRS= include ../Makefile.common -base=uffi +base=clsql_uffi source=$(base).c object=$(base).o shared_lib=$(base).so diff --git a/uffi/Makefile.msvc b/uffi/Makefile.msvc index 2edbfca..021be37 100644 --- a/uffi/Makefile.msvc +++ b/uffi/Makefile.msvc @@ -17,7 +17,7 @@ ########################################################################### -BASE=uffi +BASE=clsql_uffi # Nothing to configure beyond here diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp index 05eee3f..28fd7ed 100644 --- a/uffi/clsql-uffi-loader.lisp +++ b/uffi/clsql-uffi-loader.lisp @@ -35,12 +35,12 @@ (length filenames) filenames)))) (defvar *clsql-uffi-library-filenames* - (list #+(or 64bit x86-64) (make-pathname :name "uffi64" + (list #+(or 64bit x86-64) (make-pathname :name "clsql_uffi64" :directory clsql-uffi-system::*library-file-dir*) - #+(or 64bit x86-64) "uffi64" - (make-pathname :name "uffi" + #+(or 64bit x86-64) "clsql_uffi64" + (make-pathname :name "clsql_uffi" :directory clsql-uffi-system::*library-file-dir*) - "uffi")) + "clsql_uffi")) (defvar *clsql-uffi-supporting-libraries* '("c") "Used only by CMU. List of library flags needed to be passed to ld to diff --git a/uffi/clsql_uffi.c b/uffi/clsql_uffi.c new file mode 100644 index 0000000..531abf0 --- /dev/null +++ b/uffi/clsql_uffi.c @@ -0,0 +1,75 @@ +/**************************************************************************** + * FILE IDENTIFICATION + * + * Name: clsql-uffi.c + * Purpose: Helper functions for common interfaces using UFFI + * Programmer: Kevin M. Rosenberg + * Date Started: Mar 2002 + * + * $Id$ + * + * This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg + * + * CLSQL users are granted the rights to distribute and use this software + * as governed by the terms of the Lisp Lesser GNU Public License + * (http://opensource.franz.com/preamble.html), also known as the LLGPL. + ***************************************************************************/ + +#ifdef WIN32 +#include + +BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason, + LPVOID lpvReserved) +{ + return 1; +} + +#define DLLEXPORT __declspec(dllexport) + +#else +#define DLLEXPORT +#endif + + +const unsigned int bitmask_32bits = 0xFFFFFFFF; +#define lower_32bits(int64) ((unsigned int) int64 & bitmask_32bits) +#define upper_32bits(int64) ((unsigned int) (int64 >> 32)) + +/* Reads a 64-bit integer string, returns result as two 32-bit integers */ + +DLLEXPORT +unsigned int +atol64 (const unsigned char* str, unsigned int* pHigh32) +{ +#ifdef WIN32 + __int64 result = 0; +#else + long long result = 0; +#endif + int minus = 0; + int first_char = *str; + if (first_char == '+') + ++str; + else if (first_char == '-') { + minus = 1; + ++str; + } + + while (*str) { + int i = *str - '0'; + if (i < 0 || i > 9) /* Non-numeric character -- quit */ + break; + result = i + (10 * result); + str++; + } + if (minus) + result = -result; + + *pHigh32 = upper_32bits(result); + return lower_32bits(result); +} + + + + + diff --git a/uffi/clsql_uffi.dll b/uffi/clsql_uffi.dll new file mode 100644 index 0000000..1c41270 Binary files /dev/null and b/uffi/clsql_uffi.dll differ diff --git a/uffi/clsql_uffi.lib b/uffi/clsql_uffi.lib new file mode 100644 index 0000000..a9ee8fe Binary files /dev/null and b/uffi/clsql_uffi.lib differ diff --git a/uffi/uffi.c b/uffi/uffi.c deleted file mode 100644 index 531abf0..0000000 --- a/uffi/uffi.c +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** - * FILE IDENTIFICATION - * - * Name: clsql-uffi.c - * Purpose: Helper functions for common interfaces using UFFI - * Programmer: Kevin M. Rosenberg - * Date Started: Mar 2002 - * - * $Id$ - * - * This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg - * - * CLSQL users are granted the rights to distribute and use this software - * as governed by the terms of the Lisp Lesser GNU Public License - * (http://opensource.franz.com/preamble.html), also known as the LLGPL. - ***************************************************************************/ - -#ifdef WIN32 -#include - -BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll, DWORD fdwReason, - LPVOID lpvReserved) -{ - return 1; -} - -#define DLLEXPORT __declspec(dllexport) - -#else -#define DLLEXPORT -#endif - - -const unsigned int bitmask_32bits = 0xFFFFFFFF; -#define lower_32bits(int64) ((unsigned int) int64 & bitmask_32bits) -#define upper_32bits(int64) ((unsigned int) (int64 >> 32)) - -/* Reads a 64-bit integer string, returns result as two 32-bit integers */ - -DLLEXPORT -unsigned int -atol64 (const unsigned char* str, unsigned int* pHigh32) -{ -#ifdef WIN32 - __int64 result = 0; -#else - long long result = 0; -#endif - int minus = 0; - int first_char = *str; - if (first_char == '+') - ++str; - else if (first_char == '-') { - minus = 1; - ++str; - } - - while (*str) { - int i = *str - '0'; - if (i < 0 || i > 9) /* Non-numeric character -- quit */ - break; - result = i + (10 * result); - str++; - } - if (minus) - result = -result; - - *pHigh32 = upper_32bits(result); - return lower_32bits(result); -} - - - - - diff --git a/uffi/uffi.dll b/uffi/uffi.dll deleted file mode 100644 index 1c41270..0000000 Binary files a/uffi/uffi.dll and /dev/null differ diff --git a/uffi/uffi.lib b/uffi/uffi.lib deleted file mode 100644 index a9ee8fe..0000000 Binary files a/uffi/uffi.lib and /dev/null differ