Update unsigned type import.

Author: interkosmos

src/sqlite3.F90

@@ -5,12 +5,19 @@
 ! Author:  Philipp Engel
 ! Licence: ISC
 module sqlite3
-    use, intrinsic :: iso_c_binding
+    use, intrinsic :: iso_c_binding, only: c_associated, c_funloc, &
+                                           c_char, c_double, c_int, c_int64_t, c_size_t, &
+                                           c_funptr, c_ptr, c_null_char, c_null_funptr, c_null_ptr
+#if HAS_UNSIGNED
+
+    use, intrinsic :: iso_c_binding, only: c_unsigned
+
+#endif
     use :: sqlite3_util
     implicit none (type, external)
     private
 
-#if defined (__flang__) || (defined (__GFORTRAN__) && __GNUC__ > 15) || (defined (__GFORTRAN__) && __GNUC__ == 15 && __GNUC_MINOR__ >= 2)
+#if HAS_UNSIGNED
 
     public :: c_unsigned
 
@@ -20,6 +27,20 @@ module sqlite3
 
 #endif
 
+    public :: c_associated
+    public :: c_funloc
+
+    public :: c_char
+    public :: c_double
+    public :: c_int
+    public :: c_int64_t
+    public :: c_size_t
+    public :: c_funptr
+    public :: c_ptr
+    public :: c_null_char
+    public :: c_null_funptr
+    public :: c_null_ptr
+
     integer(kind=c_int), parameter, public :: SQLITE_INTEGER = 1
     integer(kind=c_int), parameter, public :: SQLITE_FLOAT   = 2
     integer(kind=c_int), parameter, public :: SQLITE_TEXT    = 3

src/sqlite3_util.f90

@@ -10,15 +10,6 @@ module sqlite3_util
     implicit none (type, external)
     private
 
-    interface
-        function c_strlen(str) bind(c, name='strlen')
-            import :: c_ptr, c_size_t
-            implicit none
-            type(c_ptr), intent(in), value :: str
-            integer(kind=c_size_t)         :: c_strlen
-        end function c_strlen
-    end interface
-
     public :: c_f_str_ptr
 contains
     subroutine c_f_str_ptr(c_str, f_str)
@@ -29,6 +20,15 @@ subroutine c_f_str_ptr(c_str, f_str)
         character(kind=c_char), pointer :: ptrs(:)
         integer(kind=c_size_t)          :: i, sz
 
+        interface
+            function c_strlen(str) bind(c, name='strlen')
+                import :: c_ptr, c_size_t
+                implicit none
+                type(c_ptr), intent(in), value :: str
+                integer(kind=c_size_t)         :: c_strlen
+            end function c_strlen
+        end interface
+
         copy_block: block
             if (.not. c_associated(c_str)) exit copy_block
             sz = c_strlen(c_str)

test/test_sqlite3.f90

@@ -1,6 +1,5 @@
 ! test_sqlite3.f90
 module callbacks
-    use, intrinsic :: iso_c_binding
     use :: sqlite3
     use :: sqlite3_util
     implicit none
@@ -88,7 +87,6 @@ end subroutine update_callback
 end module callbacks
 
 program test_sqlite3
-    use, intrinsic :: iso_c_binding
     use :: sqlite3
     use :: callbacks
     implicit none (type, external)