From 473fb1cce3125859074ac32c2c1ba4eb25cdfb74 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 8 Jun 2005 19:38:14 +0000 Subject: [PATCH] r10578: rename foreign library --- uffi/Makefile | 2 +- uffi/Makefile.msvc | 2 +- uffi/clsql-uffi-loader.lisp | 8 ++++---- uffi/{uffi.c => clsql_uffi.c} | 0 uffi/{uffi.dll => clsql_uffi.dll} | Bin uffi/{uffi.lib => clsql_uffi.lib} | Bin 6 files changed, 6 insertions(+), 6 deletions(-) rename uffi/{uffi.c => clsql_uffi.c} (100%) rename uffi/{uffi.dll => clsql_uffi.dll} (100%) rename uffi/{uffi.lib => clsql_uffi.lib} (100%) 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/uffi.c b/uffi/clsql_uffi.c similarity index 100% rename from uffi/uffi.c rename to uffi/clsql_uffi.c diff --git a/uffi/uffi.dll b/uffi/clsql_uffi.dll similarity index 100% rename from uffi/uffi.dll rename to uffi/clsql_uffi.dll diff --git a/uffi/uffi.lib b/uffi/clsql_uffi.lib similarity index 100% rename from uffi/uffi.lib rename to uffi/clsql_uffi.lib -- 2.34.1