ffi 1.1.5 → 1.15.5

data/ext/ffi_c/Thread.c

@@ -1,35 +1,40 @@
 /*
  * Copyright (c) 2010 Wayne Meissner
  *
+ * Copyright (c) 2008-2013, Ruby FFI project contributors
  * All rights reserved.
  *
- * This file is part of ruby-ffi.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Ruby FFI project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
  *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MSC_VER
+#include <stddef.h>
 #include <stdbool.h>
-#else
-typedef int bool;
-#define true 1
-#define false 0
-#endif
 
-#ifndef _WIN32
+#if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>
 # include <errno.h>
 # include <signal.h>
+# include <unistd.h>
 #else
 # include <winsock2.h>
 # define _WINSOCKAPI_
@@ -38,289 +43,87 @@ typedef int bool;
 #include <fcntl.h>
 #include "Thread.h"
 
+#ifdef _WIN32
+static volatile DWORD frame_thread_key = TLS_OUT_OF_INDEXES;
+#else
+static pthread_key_t thread_data_key;
+struct thread_data {
+    rbffi_frame_t* frame;
+};
+static inline struct thread_data* thread_data_get(void);
 
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
-rbffi_thread_t rbffi_active_thread;
+#endif
 
-rbffi_thread_t
-rbffi_thread_self()
+rbffi_frame_t*
+rbffi_frame_current(void)
 {
-    rbffi_thread_t self;
 #ifdef _WIN32
-    self.id = GetCurrentThreadId();
+    return (rbffi_frame_t *) TlsGetValue(frame_thread_key);
 #else
-    self.id = pthread_self();
+    struct thread_data* td = (struct thread_data *) pthread_getspecific(thread_data_key);
+    return td != NULL ? td->frame : NULL;
 #endif
-    self.valid = true;
-
-    return self;
 }
 
-bool
-rbffi_thread_equal(const rbffi_thread_t* lhs, const rbffi_thread_t* rhs)
+void
+rbffi_frame_push(rbffi_frame_t* frame)
 {
-    return lhs->valid && rhs->valid && 
+    memset(frame, 0, sizeof(*frame));
+    frame->exc = Qnil;
+
 #ifdef _WIN32
-            lhs->id == rhs->id;
+    frame->prev = TlsGetValue(frame_thread_key);
+    TlsSetValue(frame_thread_key, frame);
 #else
-            pthread_equal(lhs->id, rhs->id);
+    frame->td = thread_data_get();
+    frame->prev = frame->td->frame;
+    frame->td->frame = frame;
 #endif
 }
 
-bool
-rbffi_thread_has_gvl_p(void)
+void
+rbffi_frame_pop(rbffi_frame_t* frame)
 {
 #ifdef _WIN32
-    return rbffi_active_thread.valid && rbffi_active_thread.id == GetCurrentThreadId();
+    TlsSetValue(frame_thread_key, frame->prev);
 #else
-    return rbffi_active_thread.valid && pthread_equal(rbffi_active_thread.id, pthread_self());
+    frame->td->frame = frame->prev;
 #endif
 }
-#endif /* HAVE_RUBY_THREAD_HAS_GVL_P */
-
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-
-#if !defined(_WIN32)
-
-struct BlockingThread {
-    pthread_t tid;
-    VALUE (*fn)(void *);
-    void *data;
-    void (*ubf)(void *);
-    void *data2;
-    VALUE retval;
-    int wrfd;
-    int rdfd;
-};
-
-static void*
-rbffi_blocking_thread(void* args)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) args;
-    char c = 1;
-    VALUE retval;
-    
-    retval = (*thr->fn)(thr->data);
-    
-    pthread_testcancel();
-
-    thr->retval = retval;
-    
-    write(thr->wrfd, &c, sizeof(c));
-
-    return NULL;
-}
-
-static VALUE
-wait_for_thread(void *data)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-    char c;
-    
-    if (read(thr->rdfd, &c, 1) < 1) {
-        rb_thread_wait_fd(thr->rdfd);
-        while (read(thr->rdfd, &c, 1) < 1 && rb_io_wait_readable(thr->rdfd) == Qtrue) {
-            ;
-        }
-    }
-
-    return Qnil;
-}
-
-static VALUE
-cleanup_blocking_thread(void *data, VALUE exc)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-
-    if (thr->ubf != (void (*)(void *)) -1) {
-        (*thr->ubf)(thr->data2);
-    } else {
-        pthread_kill(thr->tid, SIGVTALRM);
-    }
-
-    return exc;
-}
-
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
-{
-    struct BlockingThread* thr;
-    int fd[2];
-    VALUE exc;
-    
-    if (pipe(fd) < 0) {
-        rb_raise(rb_eSystemCallError, "pipe(2) failed");
-        return Qnil;
-    }
-    fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_NONBLOCK);
-
-    thr = ALLOC_N(struct BlockingThread, 1);
-    thr->rdfd = fd[0];
-    thr->wrfd = fd[1];
-    thr->fn = func;
-    thr->data = data1;
-    thr->ubf = ubf;
-    thr->data2 = data2;
-    thr->retval = Qnil;
-
-    if (pthread_create(&thr->tid, NULL, rbffi_blocking_thread, thr) != 0) {
-        close(fd[0]);
-        close(fd[1]);
-        xfree(thr);
-        rb_raise(rb_eSystemCallError, "pipe(2) failed");
-        return Qnil;
-    }
-
-    exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
-        rb_eException);
-    
-    pthread_join(thr->tid, NULL);
-    close(fd[1]);
-    close(fd[0]);
-    xfree(thr);
-
-    if (exc != Qnil) {
-        rb_exc_raise(exc);
-    }
-
-    return thr->retval;
-}
-
-#else
-/* win32 implementation */
-
-struct BlockingThread {
-    HANDLE tid;
-    VALUE (*fn)(void *);
-    void *data;
-    void (*ubf)(void *);
-    void *data2;
-    VALUE retval;
-    int wrfd;
-    int rdfd;
-};
-
-static DWORD __stdcall
-rbffi_blocking_thread(LPVOID args)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) args;
-    char c = 1;
-    VALUE retval;
-
-    retval = (*thr->fn)(thr->data);
-    thr->retval = retval;
 
-    write(thr->wrfd, &c, sizeof(c));
-
-    return 0;
-}
+#ifndef _WIN32
+static struct thread_data* thread_data_init(void);
 
-static VALUE
-wait_for_thread(void *data)
+static inline struct thread_data*
+thread_data_get(void)
 {
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-    char c, res;
-    fd_set rfds;
-
-    FD_ZERO(&rfds);
-    FD_SET(thr->rdfd, &rfds);
-    rb_thread_select(thr->rdfd + 1, &rfds, NULL, NULL, NULL);
-    read(thr->rdfd, &c, 1);
-    return Qnil;
+    struct thread_data* td = (struct thread_data *) pthread_getspecific(thread_data_key);
+    return td != NULL ? td : thread_data_init();
 }
 
-static VALUE
-cleanup_blocking_thread(void *data, VALUE exc)
+static struct thread_data*
+thread_data_init(void)
 {
-    struct BlockingThread* thr = (struct BlockingThread *) data;
+    struct thread_data* td = calloc(1, sizeof(struct thread_data));
 
-    if (thr->ubf != (void (*)(void *)) -1) {
-        (*thr->ubf)(thr->data2);
-    } else {
-        TerminateThread(thr->tid, 0);
-    }
+    pthread_setspecific(thread_data_key, td);
 
-    return exc;
+    return td;
 }
 
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
+static void
+thread_data_free(void *ptr)
 {
-    struct BlockingThread* thr;
-    int fd[2];
-    VALUE exc;
-    DWORD state;
-    DWORD res;
-
-    if (_pipe(fd, 1024, O_BINARY) == -1) {
-        rb_raise(rb_eSystemCallError, "_pipe() failed");
-        return Qnil;
-    }
-
-    thr = ALLOC_N(struct BlockingThread, 1);
-    thr->rdfd = fd[0];
-    thr->wrfd = fd[1];
-    thr->fn = func;
-    thr->data = data1;
-    thr->ubf = ubf;
-    thr->data2 = data2;
-    thr->retval = Qnil;
-
-    thr->tid = CreateThread(NULL, 0, rbffi_blocking_thread, thr, 0, NULL);
-    if (!thr->tid) {
-        close(fd[0]);
-        close(fd[1]);
-        xfree(thr);
-        rb_raise(rb_eSystemCallError, "CreateThread() failed");
-        return Qnil;
-    }
-
-    exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
-        rb_eException);
-
-    /* The thread should be finished, already. */
-    WaitForSingleObject(thr->tid, INFINITE);
-    CloseHandle(thr->tid);
-    close(fd[1]);
-    close(fd[0]);
-    xfree(thr);
-
-    if (exc != Qnil) {
-        rb_exc_raise(exc);
-    }
-
-    return thr->retval;
+    free(ptr);
 }
-
-
-#if 0
-
-/*
- * FIXME: someone needs to implement something similar to the posix pipe based
- * blocking region implementation above for ruby1.8.x on win32
- */
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
-{
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    rbffi_thread_t oldThread;
-#endif
-    VALUE res;
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    oldThread = rbffi_active_thread;
-    rbffi_active_thread = rbffi_thread_self();
 #endif
 
-    res = (*func)(data1);
-
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    rbffi_active_thread = oldThread;
+void
+rbffi_Thread_Init(VALUE moduleFFI)
+{
+#ifdef _WIN32
+    frame_thread_key = TlsAlloc();
+#else
+    pthread_key_create(&thread_data_key, thread_data_free);
 #endif
-  return res;
 }
-#endif
-
-#endif /* !_WIN32 */
-
-#endif /* HAVE_RB_THREAD_BLOCKING_REGION */
-

data/ext/ffi_c/Thread.h

@@ -1,33 +1,36 @@
 /*
  * Copyright (c) 2010 Wayne Meissner
  *
+ * Copyright (c) 2008-2013, Ruby FFI project contributors
  * All rights reserved.
  *
- * This file is part of ruby-ffi.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Ruby FFI project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
  *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef RBFFI_THREAD_H
 #define	RBFFI_THREAD_H
 
-#ifndef _MSC_VER
 #include <stdbool.h>
-#else
-typedef int bool;
-#define true 1
-#define false 0
-#endif
 #include <ruby.h>
 #include "extconf.h"
 
@@ -36,11 +39,6 @@ extern "C" {
 #endif
 
 
-#ifdef HAVE_RUBY_THREAD_HAS_GVL_P
-    extern int ruby_thread_has_gvl_p(void);
-# define rbffi_thread_has_gvl_p ruby_thread_has_gvl_p
-#else
-
 #ifdef _WIN32
 # include <windows.h>
 #else
@@ -54,22 +52,21 @@ typedef struct {
     pthread_t id;
 #endif
     bool valid;
+    bool has_gvl;
+    VALUE exc;
 } rbffi_thread_t;
 
-extern rbffi_thread_t rbffi_active_thread;
-rbffi_thread_t rbffi_thread_self();
-bool rbffi_thread_equal(const rbffi_thread_t* lhs, const rbffi_thread_t* rhs);
-bool rbffi_thread_has_gvl_p(void);
-
-#endif
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-# define rbffi_thread_blocking_region rb_thread_blocking_region
-#else
-
-VALUE rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2);
-
+typedef struct rbffi_frame {
+#ifndef _WIN32
+    struct thread_data* td;
 #endif
+    struct rbffi_frame* prev;
+    VALUE exc;
+} rbffi_frame_t;
 
+rbffi_frame_t* rbffi_frame_current(void);
+void rbffi_frame_push(rbffi_frame_t* frame);
+void rbffi_frame_pop(rbffi_frame_t* frame);
 
 #ifdef	__cplusplus
 }

data/ext/ffi_c/Type.c

@@ -1,23 +1,34 @@
 /*
  * Copyright (c) 2009, Wayne Meissner
  *
- * This file is part of ruby-ffi.
+ * Copyright (c) 2008-2013, Ruby FFI project contributors
+ * All rights reserved.
  *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Ruby FFI project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 
 #include <sys/types.h>
@@ -39,6 +50,7 @@ static void builtin_type_free(BuiltinType *);
 VALUE rbffi_TypeClass = Qnil;
 
 static VALUE classBuiltinType = Qnil;
+static VALUE moduleNativeType = Qnil;
 static VALUE typeMap = Qnil, sizeMap = Qnil;
 static ID id_find_type = 0, id_type_size = 0, id_size = 0;
 
@@ -99,6 +111,7 @@ type_size(VALUE self)
 /*
  * call-seq: type.alignment
  * @return [Fixnum]
+ * Get Type alignment.
  */
 static VALUE
 type_alignment(VALUE self)
@@ -222,28 +235,9 @@ rbffi_Type_Lookup(VALUE name)
     return Qnil;
 }
 
-/**
- * rbffi_Type_Find() is like rbffi_Type_Lookup, but an error is raised if the
- * type is not found.
- */
-VALUE
-rbffi_Type_Find(VALUE name)
-{
-    VALUE rbType = rbffi_Type_Lookup(name);
-
-    if (!RTEST(rbType)) {
-        VALUE s = rb_inspect(name);
-        rb_raise(rb_eTypeError, "invalid type, %s", RSTRING_PTR(s));
-        RB_GC_GUARD(s);
-    }
-
-    return rbType;
-}
-
 void
 rbffi_Type_Init(VALUE moduleFFI)
 {
-    VALUE moduleNativeType;
     /*
      * Document-class: FFI::Type
      * This class manages C types.

data/ext/ffi_c/Type.h

@@ -1,19 +1,34 @@
 /*
  * Copyright (c) 2009, Wayne Meissner
+ * Copyright (C) 2009 Luc Heinrich <luc@honk-honk.com>
  *
  * This file is part of ruby-ffi.
  *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
+ * All rights reserved.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * version 3 for more details.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the Evan Phoenix nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef RBFFI_TYPE_H
@@ -37,7 +52,6 @@ struct Type_ {
 
 extern VALUE rbffi_TypeClass;
 extern VALUE rbffi_Type_Lookup(VALUE type);
-extern VALUE rbffi_Type_Find(VALUE type);
 
 #ifdef	__cplusplus
 }