From: Evan Nemerson <evan@coeus-group.com>
Date: Sun, 31 Jan 2010 20:51:19 +0000 (-0800)
Subject: Change many static delegates to has_target = false
X-Git-Tag: 0.7.10~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=741dd3b80dc20cf513cf374ad938a1a4fe965887;p=thirdparty%2Fvala.git

Change many static delegates to has_target = false
---

diff --git a/vapi/fuse.vapi b/vapi/fuse.vapi
index d00a021f3..5b4cc749a 100644
--- a/vapi/fuse.vapi
+++ b/vapi/fuse.vapi
@@ -48,35 +48,60 @@ namespace Fuse {
 		void *private_data;
 	}
 
-	[CCode (cname = "fuse_fill_dir_t")]
-	public static delegate int FillDir (void* buf, string name, Posix.Stat? st, Posix.off_t offset);
+	[CCode (cname = "fuse_fill_dir_t", has_target = false)]
+	public delegate int FillDir (void* buf, string name, Posix.Stat? st, Posix.off_t offset);
 
-	public static delegate int GetAttr (string path, Posix.Stat* st);
-	public static delegate int Access (string path, int mask);
-	public static delegate int ReadLink (string path, char* buf, size_t size);
-	public static delegate int ReadDir (string path, void* buf, FillDir filler, Posix.off_t offset, FileInfo fi);
-	public static delegate int MkNod (string path, Posix.mode_t mode, Posix.dev_t rdev);
-	public static delegate int MkDir (string path, Posix.mode_t mode);
-	public static delegate int Unlink (string path);
-	public static delegate int RmDir (string path);
-	public static delegate int Symlink (string from, string to);
-	public static delegate int Rename (string from, string to);
-	public static delegate int Link (string from, string to);
-	public static delegate int Chmod (string path, Posix.mode_t mode);
-	public static delegate int Chown (string path, Posix.uid_t uid, Posix.gid_t gid);
-	public static delegate int Truncate (string path, Posix.off_t size);
-	public static delegate int Utimens (string path, Posix.timespec[] ts);
-	public static delegate int Open (string path, FileInfo fi);
-	public static delegate int Read (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
-	public static delegate int Write (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
-	public static delegate int StatFs (string path, Posix.statvfs *stbuf);
-	public static delegate int Release (string path, FileInfo fi);
-	public static delegate int Fsync (string path, int isdatasync, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int GetAttr (string path, Posix.Stat* st);
+	[CCode (has_target = false)]
+	public delegate int Access (string path, int mask);
+	[CCode (has_target = false)]
+	public delegate int ReadLink (string path, char* buf, size_t size);
+	[CCode (has_target = false)]
+	public delegate int ReadDir (string path, void* buf, FillDir filler, Posix.off_t offset, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int MkNod (string path, Posix.mode_t mode, Posix.dev_t rdev);
+	[CCode (has_target = false)]
+	public delegate int MkDir (string path, Posix.mode_t mode);
+	[CCode (has_target = false)]
+	public delegate int Unlink (string path);
+	[CCode (has_target = false)]
+	public delegate int RmDir (string path);
+	[CCode (has_target = false)]
+	public delegate int Symlink (string from, string to);
+	[CCode (has_target = false)]
+	public delegate int Rename (string from, string to);
+	[CCode (has_target = false)]
+	public delegate int Link (string from, string to);
+	[CCode (has_target = false)]
+	public delegate int Chmod (string path, Posix.mode_t mode);
+	[CCode (has_target = false)]
+	public delegate int Chown (string path, Posix.uid_t uid, Posix.gid_t gid);
+	[CCode (has_target = false)]
+	public delegate int Truncate (string path, Posix.off_t size);
+	[CCode (has_target = false)]
+	public delegate int Utimens (string path, Posix.timespec[] ts);
+	[CCode (has_target = false)]
+	public delegate int Open (string path, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int Read (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int Write (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int StatFs (string path, Posix.statvfs *stbuf);
+	[CCode (has_target = false)]
+	public delegate int Release (string path, FileInfo fi);
+	[CCode (has_target = false)]
+	public delegate int Fsync (string path, int isdatasync, FileInfo fi);
 
-	public static delegate int SetXAttr (string path, string name, char* value, size_t size, int flags);
-	public static delegate int GetXAttr (string path, string name, char* value, size_t size);
-	public static delegate int ListXAttr (string path, char* list, size_t size);
-	public static delegate int RemoveXAttr (string path, string name);
+	[CCode (has_target = false)]
+	public delegate int SetXAttr (string path, string name, char* value, size_t size, int flags);
+	[CCode (has_target = false)]
+	public delegate int GetXAttr (string path, string name, char* value, size_t size);
+	[CCode (has_target = false)]
+	public delegate int ListXAttr (string path, char* list, size_t size);
+	[CCode (has_target = false)]
+	public delegate int RemoveXAttr (string path, string name);
 
 	[CCode (cname = "struct fuse_operations")]
 	public struct Operations {
diff --git a/vapi/gnutls.vapi b/vapi/gnutls.vapi
index a6560d89f..178357f53 100644
--- a/vapi/gnutls.vapi
+++ b/vapi/gnutls.vapi
@@ -425,8 +425,8 @@ namespace GnuTLS
 		public bool deinit;
 	}
 
-	[CCode (cname = "gnutls_params_function *")]
-	public static delegate int ParamsFunction (Session session, ParamsType type, Params params);
+	[CCode (cname = "gnutls_params_function *", has_target = false)]
+	public delegate int ParamsFunction (Session session, ParamsType type, Params params);
 
 	[CCode (cname = "gnutls_oprfi_callback_func", instance_pos = "1.2")]
 	public delegate int OprfiCallbackFunc (Session session,
@@ -447,24 +447,24 @@ namespace GnuTLS
 	[CCode (cname = "TLS_RANDOM_SIZE")]
 	public const int TLS_RANDOM_SIZE;
 
-	[CCode (cname = "gnutls_db_store_func")]
-	public static delegate int DBStoreFunc (void* ptr, Datum key, Datum data);
-	[CCode (cname = "gnutls_db_remove_func")]
-	public static delegate int DBRemoveFunc (void* ptr, Datum key);
-	[CCode (cname = "gnutls_db_retr_func")]
-	public static delegate Datum DBRetrieveFunc (void* ptr, Datum key);
+	[CCode (cname = "gnutls_db_store_func", has_target = false)]
+	public delegate int DBStoreFunc (void* ptr, Datum key, Datum data);
+	[CCode (cname = "gnutls_db_remove_func", has_target = false)]
+	public delegate int DBRemoveFunc (void* ptr, Datum key);
+	[CCode (cname = "gnutls_db_retr_func", has_target = false)]
+	public delegate Datum DBRetrieveFunc (void* ptr, Datum key);
 
-	[CCode (cname = "gnutls_handshake_post_client_hello_func")]
-	public static delegate int HandshakePostClientHelloFunc (Session session);
+	[CCode (cname = "gnutls_handshake_post_client_hello_func", has_target = false)]
+	public delegate int HandshakePostClientHelloFunc (Session session);
 
 	// External signing callback.  Experimental.
 	[CCode (cname = "gnutls_sign_func", instance_pos = "1.9")]
 	public delegate int SignFunc (Session session, CertificateType cert_type, /* const */ ref Datum cert, /* const */ ref Datum hash, out Datum signature);
 
-	[CCode (cname = "gnutls_pull_func")]
-	public static delegate ssize_t PullFunc (void* transport_ptr, void* buffer, size_t count);
-	[CCode (cname = "gnutls_push_func")]
-	public static delegate ssize_t PushFunc (void* transport_ptr, void* buffer, size_t count);
+	[CCode (cname = "gnutls_pull_func", has_target = false)]
+	public delegate ssize_t PullFunc (void* transport_ptr, void* buffer, size_t count);
+	[CCode (cname = "gnutls_push_func", has_target = false)]
+	public delegate ssize_t PushFunc (void* transport_ptr, void* buffer, size_t count);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_session_int", free_function = "gnutls_deinit")]
@@ -1290,7 +1290,8 @@ namespace GnuTLS
 		* gnutls_openpgp_set_recv_key_function().
 		*
 		*/
-		public static delegate int RecvKeyFunc (Session session, uint8[] keyfpr, out Datum key);
+		[CCode (has_target = false)]
+		public delegate int RecvKeyFunc (Session session, uint8[] keyfpr, out Datum key);
 
 		[CCode (cname = "gnutls_openpgp_crt_fmt_t", cprefix = "GNUTLS_OPENPGP_FMT_")]
 		public enum CertificateFormat {
@@ -1434,11 +1435,10 @@ namespace GnuTLS
 	}
 
 
-
-	[CCode (cname = "gnutls_certificate_client_retrieve_function *")]
-	public static delegate int ClientCertificateRetrieveFunction (Session session, Datum[] req_ca_rdn, PKAlgorithm[] pk_algos, out RetrStruct st);
-	[CCode (cname = "gnutls_certificate_server_retrieve_function *")]
-	public static delegate int ServerCertificateRetrieveFunction (Session session, out RetrStruct st);
+	[CCode (cname = "gnutls_certificate_client_retrieve_function *", has_target = false)]
+	public delegate int ClientCertificateRetrieveFunction (Session session, Datum[] req_ca_rdn, PKAlgorithm[] pk_algos, out RetrStruct st);
+	[CCode (cname = "gnutls_certificate_server_retrieve_function *", has_target = false)]
+	public delegate int ServerCertificateRetrieveFunction (Session session, out RetrStruct st);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_certificate_credentials_st",
@@ -1525,16 +1525,16 @@ namespace GnuTLS
 	[CCode (cname = "gnutls_strdup")]
 	public string strdup (string str);
 
-	[CCode (cname = "gnutls_alloc_function")]
-	public static delegate void* AllocFunction (size_t size);
-	[CCode (cname = "gnutls_calloc_function")]
-	public static delegate void* CallocFunction (size_t count, size_t block_size);
-	[CCode (cname = "gnutls_is_secure_function")]
-	public static delegate int IsSecureFunction (void* ptr);
-	[CCode (cname = "gnutls_free_function")]
-	public static delegate void FreeFunction (void* ptr);
-	[CCode (cname = "gnutls_realloc_function")]
-	public static delegate void* ReallocFunction (void* ptr, size_t new_size);
+	[CCode (cname = "gnutls_alloc_function", has_target = false)]
+	public delegate void* AllocFunction (size_t size);
+	[CCode (cname = "gnutls_calloc_function", has_target = false)]
+	public delegate void* CallocFunction (size_t count, size_t block_size);
+	[CCode (cname = "gnutls_is_secure_function", has_target = false)]
+	public delegate int IsSecureFunction (void* ptr);
+	[CCode (cname = "gnutls_free_function", has_target = false)]
+	public delegate void FreeFunction (void* ptr);
+	[CCode (cname = "gnutls_realloc_function", has_target = false)]
+	public delegate void* ReallocFunction (void* ptr, size_t new_size);
 
 	public int global_init ();
 	public void global_deinit ();
@@ -1544,8 +1544,8 @@ namespace GnuTLS
 	                               IsSecureFunction is_secure_func, ReallocFunction realloc_func,
 	                               FreeFunction free_func);
 
-	[CCode (cname = "gnutls_log_func")]
-	public static delegate void LogFunc (int level, string msg);
+	[CCode (cname = "gnutls_log_func", has_target = false)]
+	public delegate void LogFunc (int level, string msg);
 	[CCode (cname = "gnutls_global_set_log_function")]
 	public void set_log_function (LogFunc func);
 	[CCode (cname = "gnutls_global_set_log_level")]
@@ -1556,10 +1556,10 @@ namespace GnuTLS
 
 // SRP stuff
 
-	[CCode (cname = "gnutls_srp_server_credentials_function *")]
-	public static delegate int SRPServerCredentialsFunction (Session session, string username,
-	                                                         out Datum salt, out Datum verifier,
-	                                                         out Datum generator, out Datum prime);
+	[CCode (cname = "gnutls_srp_server_credentials_function *", has_target = false)]
+	public delegate int SRPServerCredentialsFunction (Session session, string username,
+                                                       out Datum salt, out Datum verifier,
+                                                       out Datum generator, out Datum prime);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_srp_server_credentials_st", free_function = "gnutls_srp_free_server_credentials")]
@@ -1586,8 +1586,8 @@ namespace GnuTLS
 		public void set_credentials_function (SRPServerCredentialsFunction func);
 	}
 
-	[CCode (cname = "gnutls_srp_client_credentials_function *")]
-	public static delegate int SRPClientCredentialsFunction (Session session, out string username, out string password);
+	[CCode (cname = "gnutls_srp_client_credentials_function *", has_target = false)]
+	public delegate int SRPClientCredentialsFunction (Session session, out string username, out string password);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_srp_client_credentials_st", free_function = "gnutls_srp_free_client_credentials")]
@@ -1652,8 +1652,8 @@ namespace GnuTLS
 		HEX
 	}
 
-	[CCode (cname = "gnutls_psk_server_credentials_function *")]
-	public static delegate int PSKServerCredentialsFunction (Session session, string username, /* const */ ref Datum key);
+	[CCode (cname = "gnutls_psk_server_credentials_function *", has_target = false)]
+	public delegate int PSKServerCredentialsFunction (Session session, string username, /* const */ ref Datum key);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_psk_server_credentials_st", free_function = "gnutls_psk_free_server_credentials")]
@@ -1686,8 +1686,8 @@ namespace GnuTLS
 		public void set_params_function (ParamsFunction func);
 	}
 
-	[CCode (cname = "gnutls_psk_client_credentials_function *")]
-	public static delegate int PSKClientCredentialsFunction (Session session, out string username, out Datum key);
+	[CCode (cname = "gnutls_psk_client_credentials_function *", has_target = false)]
+	public delegate int PSKClientCredentialsFunction (Session session, out string username, out Datum key);
 
 	[Compact]
 	[CCode (cname = "struct gnutls_psk_client_credentials_st", free_function = "gnutls_psk_free_client_credentials")]
diff --git a/vapi/gsl.vapi b/vapi/gsl.vapi
index caa9c0923..bdb580232 100644
--- a/vapi/gsl.vapi
+++ b/vapi/gsl.vapi
@@ -517,9 +517,11 @@ namespace Gsl
 		SINGLE,
 		APPROX
 	}
-	
-	public static delegate void ErrorHandler (string reason, string file, int line, int errno);
-	public static delegate void StreamHandler (string label, string file, int line, string reason);
+
+	[CCode (has_target = false)]
+	public delegate void ErrorHandler (string reason, string file, int line, int errno);
+	[CCode (has_target = false)]
+	public delegate void StreamHandler (string label, string file, int line, string reason);
 	
 	[CCode (lower_case_cprefix="gsl_", cheader_filename="gsl/gsl_errno.h")]
 	namespace Error
@@ -565,9 +567,11 @@ namespace Gsl
 	}
 	
 	/* The isnan, isinf and finite are define in the double type. The elementary functions are in GLib.Math */
-	
-	public static delegate double _Function (double x, void* params);
-	public static delegate void _FunctionFdf (double x, void* params, out double f, out double df);
+
+	[CCode (has_target = false)]
+	public delegate double _Function (double x, void* params);
+	[CCode (has_target = false)]
+	public delegate void _FunctionFdf (double x, void* params, out double f, out double df);
 	
 	[SimpleType]
 	[CCode (cname="gsl_function", cheader_filename="gsl/gsl_math.h")]
@@ -2537,9 +2541,12 @@ namespace Gsl
 	/*
 	 * Random Number Generation
 	 */
-	public static delegate void RNGSetState (void *state, ulong seed);
-	public static delegate ulong RNGGetState (void* state);
-	public static delegate double RNGGetDouble (void* state);
+	[CCode (has_target = false)]
+	public delegate void RNGSetState (void *state, ulong seed);
+	[CCode (has_target = false)]
+	public delegate ulong RNGGetState (void* state);
+	[CCode (has_target = false)]
+	public delegate double RNGGetDouble (void* state);
 
 	[SimpleType]
 	[CCode (cname="gsl_rng_type", cheader_filename="gsl/gsl_rng.h")]
@@ -2790,9 +2797,12 @@ namespace Gsl
 	/*
 	 * Quasi-Random Sequences
 	 */
-	public static delegate size_t QRNGStateSize (uint dimension);
-	public static delegate int QRNGInitState (void* state, uint dimension);
-	public static delegate int QRNGGetState2 (void* state, uint dimension, out double x);
+	[CCode (has_target = false)]
+	public delegate size_t QRNGStateSize (uint dimension);
+	[CCode (has_target = false)]
+	public delegate int QRNGInitState (void* state, uint dimension);
+	[CCode (has_target = false)]
+	public delegate int QRNGGetState2 (void* state, uint dimension, out double x);
 	
 	[SimpleType]
 	[CCode (cname="gsl_qrng_type", cheader_filename="gsl/gsl_qrng.h")]
@@ -3206,7 +3216,8 @@ namespace Gsl
 	/*
 	 * N-Tuples
 	 */
-	public static delegate int NTupleFunc (void* ntuple_data, void* params);
+	[CCode (has_target = false)]
+	public delegate int NTupleFunc (void* ntuple_data, void* params);
 	
 	[SimpleType]
 	[CCode (cname="gsl_ntuple_select_fn", cheader_filename="gsl/gsl_ntuple.h")]
@@ -3253,7 +3264,8 @@ namespace Gsl
 		STRATIFIED
 	}
 	
-	public static delegate double MonteFunc ([CCode (array_length = false)] double[] x_array, size_t dim, void* params);
+	[CCode (has_target = false)]
+	public delegate double MonteFunc ([CCode (array_length = false)] double[] x_array, size_t dim, void* params);
 	
 	[SimpleType]
 	[CCode (cname="gsl_monte_function", cheader_filanema="gsl/gsl_monte.h")]
@@ -3372,13 +3384,20 @@ namespace Gsl
 	[CCode (lower_case_cprefix="gsl_siman_", cheader_filename="gsl/gsl_siman.h")]
 	namespace Siman
 	{
-		public static delegate double Efunc_t (void *xp);
-		public static delegate void step_t (RNG r, void *xp, double step_size);
-		public static delegate double metric_t (void *xp, void* yp);
-		public static delegate void print_t (void* xp);
-		public static delegate void copy_t (void* source, void* dest);
-		public static delegate void copy_construct_t (void* xp);
-		public static delegate void destroy_t (void* xp);
+		[CCode (has_target = false)]
+		public delegate double Efunc_t (void *xp);
+		[CCode (has_target = false)]
+		public delegate void step_t (RNG r, void *xp, double step_size);
+		[CCode (has_target = false)]
+		public delegate double metric_t (void *xp, void* yp);
+		[CCode (has_target = false)]
+		public delegate void print_t (void* xp);
+		[CCode (has_target = false)]
+		public delegate void copy_t (void* source, void* dest);
+		[CCode (has_target = false)]
+		public delegate void copy_construct_t (void* xp);
+		[CCode (has_target = false)]
+		public delegate void destroy_t (void* xp);
 	
 		public static void solve(RNG r, void *x0_p, Efunc_t Ef, step_t take_step, metric_t distance, print_t print_position, copy_t copyfunc, copy_construct_t copy_constructor, destroy_t destructor, size_t element_size, SimanParams params);
 		public static void solve_many (RNG r, void *x0_p, Efunc_t Ef, step_t take_step, metric_t distance, print_t print_position, size_t element_size, SimanParams params);
@@ -3396,17 +3415,28 @@ namespace Gsl
 		DEC
 	}
 	
-	public static delegate int OdeivFunction (double t, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] dydt, void* params);
-	public static delegate int OdeivJacobian (double t, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] dfdy, [CCode (array_length = false)] double[] dfdt, void* params);
-	public static delegate void* OdeivStepAlloc (size_t dim);
-	public static delegate int OdeivStepApply (void* state, size_t dim, double t, double h, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] yerr, [CCode (array_length = false)] double[] dydt_in, [CCode (array_length = false)] double[] dydt_out, OdeivSystem* dydt);
-	public static delegate int OdeivStepReset (void* state, size_t dim);
-	public static delegate uint OdeivStepOrder (void* state);
-	public static delegate void OdeivStepFree (void* state);
-	public static delegate void* OdeivControlAlloc ();
-	public static delegate int OdeivControlInit (void* state, double eps_abs, double eps_rel, double a_y, double a_dydt);
-	public static delegate int OdeivControlHadjust (void* state, size_t dim, uint ord, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] yerr, [CCode (array_length = false)] double[] yp, [CCode (array_length = false)] double[] h);
-	public static delegate void OdeivControlFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int OdeivFunction (double t, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] dydt, void* params);
+	[CCode (has_target = false)]
+	public delegate int OdeivJacobian (double t, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] dfdy, [CCode (array_length = false)] double[] dfdt, void* params);
+	[CCode (has_target = false)]
+	public delegate void* OdeivStepAlloc (size_t dim);
+	[CCode (has_target = false)]
+	public delegate int OdeivStepApply (void* state, size_t dim, double t, double h, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] yerr, [CCode (array_length = false)] double[] dydt_in, [CCode (array_length = false)] double[] dydt_out, OdeivSystem* dydt);
+	[CCode (has_target = false)]
+	public delegate int OdeivStepReset (void* state, size_t dim);
+	[CCode (has_target = false)]
+	public delegate uint OdeivStepOrder (void* state);
+	[CCode (has_target = false)]
+	public delegate void OdeivStepFree (void* state);
+	[CCode (has_target = false)]
+	public delegate void* OdeivControlAlloc ();
+	[CCode (has_target = false)]
+	public delegate int OdeivControlInit (void* state, double eps_abs, double eps_rel, double a_y, double a_dydt);
+	[CCode (has_target = false)]
+	public delegate int OdeivControlHadjust (void* state, size_t dim, uint ord, [CCode (array_length = false)] double[] y, [CCode (array_length = false)] double[] yerr, [CCode (array_length = false)] double[] yp, [CCode (array_length = false)] double[] h);
+	[CCode (has_target = false)]
+	public delegate void OdeivControlFree (void* state);
 	
 	[SimpleType]
 	[CCode (cname="gsl_odeiv_system", cheader_filename="gsl/gsl_odeiv.h")]
@@ -3522,13 +3552,20 @@ namespace Gsl
 	/*
 	 * Interpolation
 	 */
-	public static delegate void* InterpAlloc (size_t size);
-	public static delegate int InterpInit (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size);
-	public static delegate int InterpEval (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y);
-	public static delegate int InterpEvalDeriv (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y_p);
-	public static delegate int InterpEvalDeriv2 (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y_pp);
-	public static delegate int InterpEvalInteg (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, InterpAccel* i, double a, double b, out double result);
-	public static delegate void InterpFree (void* t);
+	[CCode (has_target = false)]
+	public delegate void* InterpAlloc (size_t size);
+	[CCode (has_target = false)]
+	public delegate int InterpInit (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size);
+	[CCode (has_target = false)]
+	public delegate int InterpEval (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y);
+	[CCode (has_target = false)]
+	public delegate int InterpEvalDeriv (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y_p);
+	[CCode (has_target = false)]
+	public delegate int InterpEvalDeriv2 (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, double x, InterpAccel* i, out double y_pp);
+	[CCode (has_target = false)]
+	public delegate int InterpEvalInteg (void* t, [CCode (array_length = false)] double[] xa, [CCode (array_length = false)] double[] ya, size_t size, InterpAccel* i, double a, double b, out double result);
+	[CCode (has_target = false)]
+	public delegate void InterpFree (void* t);
 	
 	[Compact]
 	[CCode (cname="gsl_interp_accel", cheader_filname="gsl/gsl_interp.h")]
@@ -3723,7 +3760,8 @@ namespace Gsl
 		backward = -1
 	}
 	
-	public static delegate int WaveletInit (double** h1, double** g1, double** h2, double** g2, size_t* nc, size_t* offset, size_t member);
+	[CCode (has_target = false)]
+	public delegate int WaveletInit (double** h1, double** g1, double** h2, double** g2, size_t* nc, size_t* offset, size_t member);
 	
 	[SimpleType]
 	[CCode (cname="gsl_wavelet_type", cheader_filename="gsl/gsl_wavelet.h")]
@@ -3830,10 +3868,14 @@ namespace Gsl
 	/*
 	 * One dimensional Root-Finding
 	 */
-	public static delegate int RootFsolverSet (void* state, Function* f, double* root, double x_lower, double x_upper);
-	public static delegate int RootFsolverIterate (void* state, Function* f, double* root, double* x_lower, double* x_upper);
-	public static delegate int RootFdfsolverSet (void* state, FunctionFdf* f, double* root);
-	public static delegate int RootFdfsolverIterate (void* state, FunctionFdf* d, double* root);
+	[CCode (has_target = false)]
+	public delegate int RootFsolverSet (void* state, Function* f, double* root, double x_lower, double x_upper);
+	[CCode (has_target = false)]
+	public delegate int RootFsolverIterate (void* state, Function* f, double* root, double* x_lower, double* x_upper);
+	[CCode (has_target = false)]
+	public delegate int RootFdfsolverSet (void* state, FunctionFdf* f, double* root);
+	[CCode (has_target = false)]
+	public delegate int RootFdfsolverIterate (void* state, FunctionFdf* d, double* root);
 	
 	[SimpleType]
 	[CCode (cname="gsl_root_fsolver_type", cheader_filename="gsl/gsl_roots.h")]
@@ -3917,9 +3959,12 @@ namespace Gsl
 	/*
 	 * One dimensional Minimization
 	 */
-	public static delegate int MinSet (void* state, Function* f, double xminimun, double f_minimum, double x_lower, double f_lower, double x_upper, double f_upper);
-	public static delegate int MinIterate (void *state, Function* f, double* x_minimum, double* f_minimum, double* x_lower, double* f_lower, double* x_upper, double* f_upper);
-	public static delegate int MinBracketingFunction (Function* f, double* x_minimum, double* f_minimum, double* x_lower, double* f_lower, double* x_upper, double* f_upper, size_t eval_max);
+	[CCode (has_target = false)]
+	public delegate int MinSet (void* state, Function* f, double xminimun, double f_minimum, double x_lower, double f_lower, double x_upper, double f_upper);
+	[CCode (has_target = false)]
+	public delegate int MinIterate (void *state, Function* f, double* x_minimum, double* f_minimum, double* x_lower, double* f_lower, double* x_upper, double* f_upper);
+	[CCode (has_target = false)]
+	public delegate int MinBracketingFunction (Function* f, double* x_minimum, double* f_minimum, double* x_lower, double* f_lower, double* x_upper, double* f_upper, size_t eval_max);
 	
 	[SimpleType]
 	[CCode (cname="gsl_min_fminimizer_type", cheader_filename="gsl/gsl_min.h")]
@@ -3973,17 +4018,28 @@ namespace Gsl
 	/*
 	 * Multidimensional Root-Finding
 	 */
-	public static delegate int MultirootF (Vector x, void* params, Vector f);
-	public static delegate int MultirootFAlloc (void* state, size_t n);
-	public static delegate int MultirootFSet (void* state, MultirootFunction* function, Vector x, Vector f, Vector dx);
-	public static delegate int MultirootFIterate (void* state, MultirootFunction* function, Vector x, Vector f, Vector dx);
-	public static delegate void MultirootFFree (void* state);
-	public static delegate int MultirootDF (Vector x, void* params, Matrix df);
-	public static delegate int MultirootFDF (Vector x, void* params, Vector f, Matrix df);
-	public static delegate int MultirootFdfAlloc (void* state, size_t n);
-	public static delegate int MultirootFdfSet (void* state, MultirootFunctionFdf* fdf, Vector x, Vector f, Matrix J, Vector dx);
-	public static delegate int MultirootFdfIterate (void* state, MultirootFunctionFdf* fdf, Vector x, Vector f, Matrix J, Vector dx);
-	public static delegate int MultirootFdfFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultirootF (Vector x, void* params, Vector f);
+	[CCode (has_target = false)]
+	public delegate int MultirootFAlloc (void* state, size_t n);
+	[CCode (has_target = false)]
+	public delegate int MultirootFSet (void* state, MultirootFunction* function, Vector x, Vector f, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultirootFIterate (void* state, MultirootFunction* function, Vector x, Vector f, Vector dx);
+	[CCode (has_target = false)]
+	public delegate void MultirootFFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultirootDF (Vector x, void* params, Matrix df);
+	[CCode (has_target = false)]
+	public delegate int MultirootFDF (Vector x, void* params, Vector f, Matrix df);
+	[CCode (has_target = false)]
+	public delegate int MultirootFdfAlloc (void* state, size_t n);
+	[CCode (has_target = false)]
+	public delegate int MultirootFdfSet (void* state, MultirootFunctionFdf* fdf, Vector x, Vector f, Matrix J, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultirootFdfIterate (void* state, MultirootFunctionFdf* fdf, Vector x, Vector f, Matrix J, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultirootFdfFree (void* state);
 	
 	[SimpleType]
 	[CCode (cname="gsl_multiroot_function", cheader_filename="gsl/gsl_multiroots.h")]
@@ -4100,13 +4156,20 @@ namespace Gsl
 	/*
 	 * Multidimensional Minimization
 	 */
-	public static delegate double MultiminF (Vector x, void* params);
-	public static delegate void MultiminDf (Vector x, void* params, Vector df);
-	public static delegate void MultiminFdf (Vector x, void* params, double* f, Vector df);
-	public static delegate int MultiminFAlloc (void *state, size_t n);
-	public static delegate int MultiminFSet (void* state, MultiminFunction* f, Vector x, double* size);
-	public static delegate int MultiminFIterate (void* state, MultiminFunction* f, Vector x, double* size, double* fval);
-	public static delegate int MultiminFFree (void* state);
+	[CCode (has_target = false)]
+	public delegate double MultiminF (Vector x, void* params);
+	[CCode (has_target = false)]
+	public delegate void MultiminDf (Vector x, void* params, Vector df);
+	[CCode (has_target = false)]
+	public delegate void MultiminFdf (Vector x, void* params, double* f, Vector df);
+	[CCode (has_target = false)]
+	public delegate int MultiminFAlloc (void *state, size_t n);
+	[CCode (has_target = false)]
+	public delegate int MultiminFSet (void* state, MultiminFunction* f, Vector x, double* size);
+	[CCode (has_target = false)]
+	public delegate int MultiminFIterate (void* state, MultiminFunction* f, Vector x, double* size, double* fval);
+	[CCode (has_target = false)]
+	public delegate int MultiminFFree (void* state);
 	
 	[SimpleType]
 	[CCode (cname="gsl_multimin_function", cheader_filename="gsl/gsl_multimin.h")]
@@ -4169,11 +4232,16 @@ namespace Gsl
 		public static int size (double size, double epsabs);
 	}
 	
-	public static delegate int MultiminFdfAlloc (void *state, size_t n);
-	public static delegate int MultiminFdfSet (void* state, MultiminFunctionFdf* fdf, Vector x, double* f, Vector gradient, double step_size, double tol);
-	public static delegate int MultiminFdfIterate (void* state, MultiminFunctionFdf* fdf, Vector x, double* f, Vector gradient, Vector dx);
-	public static delegate int MultiminFdfRestart (void* state);
-	public static delegate int MultiminFdfFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultiminFdfAlloc (void *state, size_t n);
+	[CCode (has_target = false)]
+	public delegate int MultiminFdfSet (void* state, MultiminFunctionFdf* fdf, Vector x, double* f, Vector gradient, double step_size, double tol);
+	[CCode (has_target = false)]
+	public delegate int MultiminFdfIterate (void* state, MultiminFunctionFdf* fdf, Vector x, double* f, Vector gradient, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultiminFdfRestart (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultiminFdfFree (void* state);
 	
 	[SimpleType]
 	[CCode (cname="gsl_multimin_fdfminimizer_type", cheader_filename="gsl/gsl_multimin.h")]
@@ -4273,17 +4341,28 @@ namespace Gsl
 	/*
 	 * Nonlinear Least-Squares Fitting
 	 */
-	public static delegate int MultifitF (Vector x, void* params, Vector f);
-	public static delegate int MultifitFAlloc (void* state, size_t n, size_t p);
-	public static delegate int MultifitFSet (void* state, MultifitFunction* function, Vector x, Vector f, Vector dx);
-	public static delegate int MultifitFIterate (void* state, MultifitFunction* function, Vector x, Vector f, Vector dx);
-	public static delegate void MultifitFFree (void* state);
-	public static delegate int MultifitDf (Vector x, void* params, Matrix df);
-	public static delegate int MultifitFdf (Vector x, void* params, Vector f, Matrix df);
-	public static delegate int MultifitFdfAlloc (void* state, size_t n, size_t p);
-	public static delegate int MultifitFdfSet (void* state, MultifitFunctionFdf fdf, Vector x, Vector f, Matrix J, Vector dx);
-	public static delegate int MultifitFdfIterate (void* state, MultifitFunctionFdf fdf, Vector x, Vector f, Matrix J, Vector dx);
-	public static delegate void MultifitFdfFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultifitF (Vector x, void* params, Vector f);
+	[CCode (has_target = false)]
+	public delegate int MultifitFAlloc (void* state, size_t n, size_t p);
+	[CCode (has_target = false)]
+	public delegate int MultifitFSet (void* state, MultifitFunction* function, Vector x, Vector f, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultifitFIterate (void* state, MultifitFunction* function, Vector x, Vector f, Vector dx);
+	[CCode (has_target = false)]
+	public delegate void MultifitFFree (void* state);
+	[CCode (has_target = false)]
+	public delegate int MultifitDf (Vector x, void* params, Matrix df);
+	[CCode (has_target = false)]
+	public delegate int MultifitFdf (Vector x, void* params, Vector f, Matrix df);
+	[CCode (has_target = false)]
+	public delegate int MultifitFdfAlloc (void* state, size_t n, size_t p);
+	[CCode (has_target = false)]
+	public delegate int MultifitFdfSet (void* state, MultifitFunctionFdf fdf, Vector x, Vector f, Matrix J, Vector dx);
+	[CCode (has_target = false)]
+	public delegate int MultifitFdfIterate (void* state, MultifitFunctionFdf fdf, Vector x, Vector f, Matrix J, Vector dx);
+	[CCode (has_target = false)]
+	public delegate void MultifitFdfFree (void* state);
 
 	[CCode (lower_case_cprefix="gsl_multifit_", cheader_filename="gsl/gsl_multifit_nlin.h")]
 	namespace Multifit
diff --git a/vapi/hal.vapi b/vapi/hal.vapi
index aa91f4eb3..53753a668 100644
--- a/vapi/hal.vapi
+++ b/vapi/hal.vapi
@@ -22,8 +22,10 @@
 
 [CCode (cheader_filename = "libhal.h", cprefix = "LibHal")]
 namespace Hal {
-	public static delegate void DeviceAdded (Context ctx, string udi);
-	public static delegate void DeviceRemoved (Context ctx, string udi);
+	[CCode (has_target = false)]
+	public delegate void DeviceAdded (Context ctx, string udi);
+	[CCode (has_target = false)]
+	public delegate void DeviceRemoved (Context ctx, string udi);
 
 	[CCode (free_function = "libhal_ctx_free", cprefix = "libhal_ctx_")]
 	[Compact]
diff --git a/vapi/libbonoboui-2.0.vapi b/vapi/libbonoboui-2.0.vapi
index 3a533eda5..e1cb2a867 100644
--- a/vapi/libbonoboui-2.0.vapi
+++ b/vapi/libbonoboui-2.0.vapi
@@ -16,5 +16,6 @@ namespace BonoboUI {
 	{
 	}
 
-	public static delegate void VerbFn (Component component, void* user_data, string cname);
+	[CCode (has_target = false)]
+	public delegate void VerbFn (Component component, void* user_data, string cname);
 }
diff --git a/vapi/libosso.vapi b/vapi/libosso.vapi
index d3c2dbb4f..132803500 100644
--- a/vapi/libosso.vapi
+++ b/vapi/libosso.vapi
@@ -146,27 +146,27 @@ namespace Osso {
 	}
 
 	/* Callbacks */
-	[CCode (cname = "osso_rpc_cb_f")]
-	public static delegate int RpcCallback (string iface, string method, GLib.Array arguments, void* data, out Rpc rpc);
-	[CCode (cname = "osso_rpc_async_f")]
-	public static delegate int RpcAsync (string iface, string method, out Rpc rpc, void* data);
+	[CCode (cname = "osso_rpc_cb_f", has_target = false)]
+	public delegate int RpcCallback (string iface, string method, GLib.Array arguments, void* data, out Rpc rpc);
+	[CCode (cname = "osso_rpc_async_f", has_target = false)]
+	public delegate int RpcAsync (string iface, string method, out Rpc rpc, void* data);
 
-	[CCode (cname = "osso_application_top_cb_f")]
-	public static delegate void ApplicationTopCallback (string arguments, void* data);
-	[CCode (cname = "osso_application_autosave_cb_f")]
-	public static delegate void ApplicationAutosaveCallback (void* data);
-	[CCode (cname = "osso_time_cb_f")]
-	public static delegate void TimeCallback (void* data);
-	[CCode (cname = "osso_locale_change_cb_f")]
-	public static delegate void LocaleChangeCallback (string new_locale, void* data);
-	[CCode (cname = "osso_display_event_cb_f")]
-	public static delegate void DisplayEventCallback (DisplayState state, void* data);
+	[CCode (cname = "osso_application_top_cb_f", has_target = false)]
+	public delegate void ApplicationTopCallback (string arguments, void* data);
+	[CCode (cname = "osso_application_autosave_cb_f", has_target = false)]
+	public delegate void ApplicationAutosaveCallback (void* data);
+	[CCode (cname = "osso_time_cb_f", has_target = false)]
+	public delegate void TimeCallback (void* data);
+	[CCode (cname = "osso_locale_change_cb_f", has_target = false)]
+	public delegate void LocaleChangeCallback (string new_locale, void* data);
+	[CCode (cname = "osso_display_event_cb_f", has_target = false)]
+	public delegate void DisplayEventCallback (DisplayState state, void* data);
 
-	[CCode (cname = "osso_hw_cb_f*")]
-	public static delegate void HWCallback (ref HWState state, void* data);
+	[CCode (cname = "osso_hw_cb_f*", has_target = false)]
+	public delegate void HWCallback (ref HWState state, void* data);
 
-	[CCode (cname = "osso_mime_cb_f")]
-	public static delegate void MimeCallback (void* data, string[] args);
+	[CCode (cname = "osso_mime_cb_f", has_target = false)]
+	public delegate void MimeCallback (void* data, string[] args);
 
 	/* Structs */
 	[CCode (cname = "osso_state_t")]
diff --git a/vapi/libusb-1.0.vapi b/vapi/libusb-1.0.vapi
index f9a553f04..3a225f8c1 100644
--- a/vapi/libusb-1.0.vapi
+++ b/vapi/libusb-1.0.vapi
@@ -303,7 +303,8 @@ namespace LibUSB {
 		public TransferStatus status;
 	}
 
-	public static delegate void transfer_cb_fn (Transfer transfer);
+	[CCode (has_target = false)]
+	public delegate void transfer_cb_fn (Transfer transfer);
 
 	[Compact, CCode (cname = "struct libusb_transfer", cprefix = "libusb_", free_function = "libusb_free_transfer")]
 	public class Transfer {
@@ -346,8 +347,10 @@ namespace LibUSB {
 		public unowned uchar[] get_iso_packet_buffer_simple (int packet);
 	}
 
-	public static delegate void pollfd_added_cb (int fd, short events, void* user_data);
-	public static delegate void pollfd_removed_cb (int fd, void* user_data);
+	[CCode (has_target = false)]
+	public delegate void pollfd_added_cb (int fd, short events, void* user_data);
+	[CCode (has_target = false)]
+	public delegate void pollfd_removed_cb (int fd, void* user_data);
 
 	[Compact, CCode (cname = "struct libusb_pollfd")]
 	public class PollFD {
diff --git a/vapi/libxml-2.0.vapi b/vapi/libxml-2.0.vapi
index f0dfc9813..54f1f80d7 100644
--- a/vapi/libxml-2.0.vapi
+++ b/vapi/libxml-2.0.vapi
@@ -26,11 +26,11 @@
 namespace Xml {
 	/* nanoftp - minimal FTP implementation */
 
-	[CCode (cname = "ftpDataCallback", cheader_filename = "libxml/nanoftp.h")]
-	public static delegate void FtpDataCallback (void* userData, [CCode (array_length = false)] char[] data, int len);
+	[CCode (cname = "ftpDataCallback", cheader_filename = "libxml/nanoftp.h", has_target = false)]
+	public delegate void FtpDataCallback (void* userData, [CCode (array_length = false)] char[] data, int len);
 
-	[CCode (cname = "ftpListCallback", cheader_filename = "libxml/nanoftp.h")]
-	public static delegate void FtpListCallback (void* userData, string filename, string attrib, string owner, string group, ulong size, int links, int year, string month, int day, int hour, int minute);
+	[CCode (cname = "ftpListCallback", cheader_filename = "libxml/nanoftp.h", has_target = false)]
+	public delegate void FtpListCallback (void* userData, string filename, string attrib, string owner, string group, ulong size, int links, int year, string month, int day, int hour, int minute);
 
 	[Compact]
 	[CCode (cname = "void", free_function = "xmlNanoFTPFreeCtxt", cheader_filename = "libxml/nanoftp.h")]
@@ -802,11 +802,11 @@ namespace Xml {
 
 	/* xmlIO - interface for the I/O interfaces used by the parser */
 
-	[CCode (cname = "xmlInputCloseCallback", cheader_filename = "libxml/xmlIO.h")]
-	public static delegate int InputCloseCallback (void* context);
+	[CCode (cname = "xmlInputCloseCallback", cheader_filename = "libxml/xmlIO.h", has_target = false)]
+	public delegate int InputCloseCallback (void* context);
 
-	[CCode (cname = "xmlInputReadCallback", cheader_filename = "libxml/xmlIO.h")]
-	public static delegate int InputReadCallback (void* context, [CCode (array_length = false)] char[] buffer, int len);
+	[CCode (cname = "xmlInputReadCallback", cheader_filename = "libxml/xmlIO.h", has_target = false)]
+	public delegate int InputReadCallback (void* context, [CCode (array_length = false)] char[] buffer, int len);
 
 
 	/* xmlschemas - incomplete XML Schemas structure implementation */
@@ -1101,7 +1101,8 @@ namespace Xml {
 		READING
 	}
 
-	public static delegate void TextReaderErrorFunc (void* arg, string msg, ParserSeverities severity, TextReaderLocator* locator);
+	[CCode (has_target = false)]
+	public delegate void TextReaderErrorFunc (void* arg, string msg, ParserSeverities severity, TextReaderLocator* locator);
 
 
 	/* xpath - XML Path Language implementation */
@@ -1205,98 +1206,98 @@ namespace Xml {
 
 	/* SAX CALLBACKS */
 
-	[CCode (cname = "attributeDeclSAXFunc")]
-	public static delegate void attributeDeclSAXFunc (void* ctx, string elem, string fullname, int type, int def, string defaultValue, Enumeration* tree);
+	[CCode (cname = "attributeDeclSAXFunc", has_target = false)]
+	public delegate void attributeDeclSAXFunc (void* ctx, string elem, string fullname, int type, int def, string defaultValue, Enumeration* tree);
 
-	[CCode (cname = "attributeSAXFunc")]
-	public static delegate void attributeSAXFunc (void* ctx, string name, string value);
+	[CCode (cname = "attributeSAXFunc", has_target = false)]
+	public delegate void attributeSAXFunc (void* ctx, string name, string value);
 
-	[CCode (cname = "cdataBlockSAXFunc")]
-	public static delegate void cdataBlockSAXFunc (void* ctx, string value, int len);
+	[CCode (cname = "cdataBlockSAXFunc", has_target = false)]
+	public delegate void cdataBlockSAXFunc (void* ctx, string value, int len);
 
-	[CCode (cname = "charactersSAXFunc")]
-	public static delegate void charactersSAXFunc (void* ctx, string ch, int len);
+	[CCode (cname = "charactersSAXFunc", has_target = false)]
+	public delegate void charactersSAXFunc (void* ctx, string ch, int len);
 
-	[CCode (cname = "commentsSAXFunc")]
-	public static delegate void commentSAXFunc (void* ctx, string value);
+	[CCode (cname = "commentsSAXFunc", has_target = false)]
+	public delegate void commentSAXFunc (void* ctx, string value);
 
-	[CCode (cname = "elementDeclSAXFunc")]
-	public static delegate void elementDeclSAXFunc (void* ctx, string name, int type, ElementContent content);
+	[CCode (cname = "elementDeclSAXFunc", has_target = false)]
+	public delegate void elementDeclSAXFunc (void* ctx, string name, int type, ElementContent content);
 
-	[CCode (cname = "endDocumentSAXFunc")]
-	public static delegate void endDocumentSAXFunc (void* ctx);
+	[CCode (cname = "endDocumentSAXFunc", has_target = false)]
+	public delegate void endDocumentSAXFunc (void* ctx);
 
-	[CCode (cname = "endElementNsSAX2Func")]
-	public static delegate void endElementNsSAX2Func (void* ctx, string localname, string prefix, string URI);
+	[CCode (cname = "endElementNsSAX2Func", has_target = false)]
+	public delegate void endElementNsSAX2Func (void* ctx, string localname, string prefix, string URI);
 
-	[CCode (cname = "endElementSAXFunc")]
-	public static delegate void endElementSAXFunc (void* ctx, string name);
+	[CCode (cname = "endElementSAXFunc", has_target = false)]
+	public delegate void endElementSAXFunc (void* ctx, string name);
 
-	[CCode (cname = "entityDeclSAXFunc")]
-	public static delegate void entityDeclSAXFunc (void* ctx, string name, int type, string publicId, string systemId, string content);
+	[CCode (cname = "entityDeclSAXFunc", has_target = false)]
+	public delegate void entityDeclSAXFunc (void* ctx, string name, int type, string publicId, string systemId, string content);
 
-	[CCode (cname = "errorSAXFunc")]
-	public static delegate void errorSAXFunc (void* ctx, string msg, ...);
+	[CCode (cname = "errorSAXFunc", has_target = false)]
+	public delegate void errorSAXFunc (void* ctx, string msg, ...);
 
-	[CCode (cname = "externalSubsetSAXFunc")]
-	public static delegate void externalSubsetSAXFunc (void* ctx, string name, string ExternalID, string SystemID);
+	[CCode (cname = "externalSubsetSAXFunc", has_target = false)]
+	public delegate void externalSubsetSAXFunc (void* ctx, string name, string ExternalID, string SystemID);
 
-	[CCode (cname = "fatalErrorSAXFunc")]
-	public static delegate void fatalErrorSAXFunc (void* ctx, string msg, ...);
+	[CCode (cname = "fatalErrorSAXFunc", has_target = false)]
+	public delegate void fatalErrorSAXFunc (void* ctx, string msg, ...);
 
-	[CCode (cname = "getEntitySAXFunc")]
-	public static delegate Entity* getEntitySAXFunc (void* ctx, string name);
+	[CCode (cname = "getEntitySAXFunc", has_target = false)]
+	public delegate Entity* getEntitySAXFunc (void* ctx, string name);
 
-	[CCode (cname = "getParameterEntitySAXFunc")]
-	public static delegate Entity* getParameterEntitySAXFunc (void* ctx, string name);
+	[CCode (cname = "getParameterEntitySAXFunc", has_target = false)]
+	public delegate Entity* getParameterEntitySAXFunc (void* ctx, string name);
 
-	[CCode (cname = "hasExternalSubsetSAXFunc")]
-	public static delegate int hasExternalSubsetSAXFunc (void* ctx);
+	[CCode (cname = "hasExternalSubsetSAXFunc", has_target = false)]
+	public delegate int hasExternalSubsetSAXFunc (void* ctx);
 
-	[CCode (cname = "hasInternalSubsetSAXFunc")]
-	public static delegate int hasInternalSubsetSAXFunc (void* ctx);
+	[CCode (cname = "hasInternalSubsetSAXFunc", has_target = false)]
+	public delegate int hasInternalSubsetSAXFunc (void* ctx);
 
-	[CCode (cname = "ignorableWhitespaceSAXFunc")]
-	public static delegate void ignorableWhitespaceSAXFunc (void* ctx, string ch, int len);
+	[CCode (cname = "ignorableWhitespaceSAXFunc", has_target = false)]
+	public delegate void ignorableWhitespaceSAXFunc (void* ctx, string ch, int len);
 
-	[CCode (cname = "internalSubsetSAXFunc")]
-	public static delegate void internalSubsetSAXFunc (void* ctx, string name, string ExternalID, string SystemID);
+	[CCode (cname = "internalSubsetSAXFunc", has_target = false)]
+	public delegate void internalSubsetSAXFunc (void* ctx, string name, string ExternalID, string SystemID);
 
-	[CCode (cname = "isStandaloneSAXFunc")]
-	public static delegate int isStandaloneSAXFunc (void* ctx);
+	[CCode (cname = "isStandaloneSAXFunc", has_target = false)]
+	public delegate int isStandaloneSAXFunc (void* ctx);
 
-	[CCode (cname = "notationDeclSAXFunc")]
-	public static delegate void notationDeclSAXFunc (void* ctx, string name, string publicId, string systemId);
+	[CCode (cname = "notationDeclSAXFunc", has_target = false)]
+	public delegate void notationDeclSAXFunc (void* ctx, string name, string publicId, string systemId);
 
-	[CCode (cname = "processingInstructionSAXFunc")]
-	public static delegate void processingInstructionSAXFunc (void* ctx, string target, string data);
+	[CCode (cname = "processingInstructionSAXFunc", has_target = false)]
+	public delegate void processingInstructionSAXFunc (void* ctx, string target, string data);
 
-	[CCode (cname = "referenceSAXFunc")]
-	public static delegate void referenceSAXFunc (void* ctx, string name);
+	[CCode (cname = "referenceSAXFunc", has_target = false)]
+	public delegate void referenceSAXFunc (void* ctx, string name);
 
-	// [CCode (cname = "resolveEntitySAXFunc")]
-	// public static delegate ParserInput resolveEntitySAXFunc (void* ctx, string publicId, string systemId);
+	// [CCode (cname = "resolveEntitySAXFunc", has_target = false)]
+	// public delegate ParserInput resolveEntitySAXFunc (void* ctx, string publicId, string systemId);
 
-	// [CCode (cname = "setDocumentLocatorSAXFunc")]
-	// public static delegate void setDocumentLocatorSAXFunc (void* ctx, SAXLocator loc);
+	// [CCode (cname = "setDocumentLocatorSAXFunc", has_target = false)]
+	// public delegate void setDocumentLocatorSAXFunc (void* ctx, SAXLocator loc);
 
-	[CCode (cname = "startDocumentSAXFunc")]
-	public static delegate void startDocumentSAXFunc (void* ctx);
+	[CCode (cname = "startDocumentSAXFunc", has_target = false)]
+	public delegate void startDocumentSAXFunc (void* ctx);
 
-	[CCode (cname = "startElementNsSAX2Func")]
-	public static delegate void startElementNsSAX2Func (void* ctx, string localname, string prefix, string URI, int nb_namespaces, [CCode (array_length = false)] string[] namespaces, int nb_attributes, int nb_defaulted, [CCode (array_length = false)] string[] attributes);
+	[CCode (cname = "startElementNsSAX2Func", has_target = false)]
+	public delegate void startElementNsSAX2Func (void* ctx, string localname, string prefix, string URI, int nb_namespaces, [CCode (array_length = false)] string[] namespaces, int nb_attributes, int nb_defaulted, [CCode (array_length = false)] string[] attributes);
 
-	[CCode (cname = "startElementSAXFunc")]
-	public static delegate void startElementSAXFunc (void* ctx, string name, [CCode (array_length = false)] string[] atts);
+	[CCode (cname = "startElementSAXFunc", has_target = false)]
+	public delegate void startElementSAXFunc (void* ctx, string name, [CCode (array_length = false)] string[] atts);
 
-	[CCode (cname = "unparsedEntityDeclSAXFunc")]
-	public static delegate void unparsedEntityDeclSAXFunc (void* ctx, string name, string publicId, string systemId, string notationName);
+	[CCode (cname = "unparsedEntityDeclSAXFunc", has_target = false)]
+	public delegate void unparsedEntityDeclSAXFunc (void* ctx, string name, string publicId, string systemId, string notationName);
 
-	[CCode (cname = "warningSAXFunc")]
-	public static delegate void warningSAXFunc (void* ctx, string msg, ...);
+	[CCode (cname = "warningSAXFunc", has_target = false)]
+	public delegate void warningSAXFunc (void* ctx, string msg, ...);
 
-	[CCode (cname ="xmlStructuredErrorFunc")]
-	public static delegate void xmlStructuredErrorFunc (void* ctx, Error* error);
+	[CCode (cname ="xmlStructuredErrorFunc", has_target = false)]
+	public delegate void xmlStructuredErrorFunc (void* ctx, Error* error);
 
 	[Compact]
 	[CCode (cname = "xmlSAXHandler")]
diff --git a/vapi/lua.vapi b/vapi/lua.vapi
index a79f9eeb7..71c081399 100644
--- a/vapi/lua.vapi
+++ b/vapi/lua.vapi
@@ -121,8 +121,8 @@ namespace Lua {
 
 	/* Function prototypes */
 
-	[CCode (cname = "lua_CFunction")]
-	public static delegate int CallbackFunc (LuaVM vm);
+	[CCode (cname = "lua_CFunction", has_target = false)]
+	public delegate int CallbackFunc (LuaVM vm);
 
 	// functions that read/write blocks when loading/dumping Lua chunks
 
@@ -142,8 +142,8 @@ namespace Lua {
 	public delegate void* AllocFunc (void* ptr, size_t osize, size_t nsize);
 
 	// Function to be called by the debuger in specific events
-	[CCode (cname = "lua_Hook")]
-	public static delegate void HookFunc (LuaVM vm, ref Debug ar);
+	[CCode (cname = "lua_Hook", has_target = false)]
+	public delegate void HookFunc (LuaVM vm, ref Debug ar);
 
 	[SimpleType]
 	[CCode (cname = "lua_Debug")]
diff --git a/vapi/tiff.vapi b/vapi/tiff.vapi
index 1b4bf7f97..fc0b368c6 100644
--- a/vapi/tiff.vapi
+++ b/vapi/tiff.vapi
@@ -187,41 +187,42 @@ namespace Tiff {
 	[CCode (cname = "uint32")]
 	public struct ttile_t : uint32 { }
 
-	public static delegate int get (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4);
-	[CCode (cname= "TIFFCloseProc")]
-	public static delegate int CloseProc (thandle_t p1);
+	[CCode (has_target = false)]
+	public delegate int get (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4);
+	[CCode (cname = "TIFFCloseProc", has_target = false)]
+	public delegate int CloseProc (thandle_t p1);
 	/* ***********************************************************************************
-	[CCode (cname= "TIFFErrorHandler")]
-	public static delegate void ErrorHandler (string p1, string p2, void* p3);
-	[CCode (cname= "TIFFErrorHandlerExt")]
-	public static delegate void ErrorHandlerExt (thandle_t p1, string p2, string p3, ...);
+	[CCode (cname = "TIFFErrorHandler", has_target = false)]
+	public delegate void ErrorHandler (string p1, string p2, void* p3);
+	[CCode (cname = "TIFFErrorHandlerExt", has_target = false)]
+	public delegate void ErrorHandlerExt (thandle_t p1, string p2, string p3, ...);
 	*********************************************************************************** */
-	[CCode (cname= "TIFFExtendProc")]
-	public static delegate void ExtendProc (TIFF p1);
-	[CCode (cname= "TIFFInitMethod")]
-	public static delegate int InitMethod (TIFF p1, int p2);
-	[CCode (cname= "TIFFMapFileProc")]
-	public static delegate int MapFileProc (thandle_t p1, ref tdata_t p2, ref toff_t p3);
-	[CCode (cname= "TIFFPrintMethod")]
-	public static delegate void PrintMethod (TIFF p1, GLib.FileStream p2, long p3);
-	[CCode (cname= "TIFFReadWriteProc")]
-	public static delegate tsize_t ReadWriteProc (thandle_t p1, tdata_t p2, tsize_t p3);
-	[CCode (cname= "TIFFSeekProc")]
-	public static delegate toff_t SeekProc (thandle_t p1, toff_t p2, int p3);
-	[CCode (cname= "TIFFSizeProc")]
-	public static delegate toff_t SizeProc (thandle_t p1);
-	[CCode (cname= "TIFFUnmapFileProc")]
-	public static delegate void UnmapFileProc (thandle_t p1, tdata_t p2, toff_t p3);
+	[CCode (cname = "TIFFExtendProc", has_target = false)]
+	public delegate void ExtendProc (TIFF p1);
+	[CCode (cname = "TIFFInitMethod", has_target = false)]
+	public delegate int InitMethod (TIFF p1, int p2);
+	[CCode (cname = "TIFFMapFileProc", has_target = false)]
+	public delegate int MapFileProc (thandle_t p1, ref tdata_t p2, ref toff_t p3);
+	[CCode (cname = "TIFFPrintMethod", has_target = false)]
+	public delegate void PrintMethod (TIFF p1, GLib.FileStream p2, long p3);
+	[CCode (cname = "TIFFReadWriteProc", has_target = false)]
+	public delegate tsize_t ReadWriteProc (thandle_t p1, tdata_t p2, tsize_t p3);
+	[CCode (cname = "TIFFSeekProc", has_target = false)]
+	public delegate toff_t SeekProc (thandle_t p1, toff_t p2, int p3);
+	[CCode (cname = "TIFFSizeProc", has_target = false)]
+	public delegate toff_t SizeProc (thandle_t p1);
+	[CCode (cname = "TIFFUnmapFileProc", has_target = false)]
+	public delegate void UnmapFileProc (thandle_t p1, tdata_t p2, toff_t p3);
 	/* *************************************************************
-	[CCode (cname= "TIFFVGetMethod")]
-	public static delegate int VGetMethod (TIFF p1, ttag_t p2, ...);
-	[CCode (cname= "TIFFVSetMethod")]
-	public static delegate int VSetMethod (TIFF p1, ttag_t p2, ...);
+	[CCode (cname = "TIFFVGetMethod", has_target = false)]
+	public delegate int VGetMethod (TIFF p1, ttag_t p2, ...);
+	[CCode (cname = "TIFFVSetMethod", has_target = false)]
+	public delegate int VSetMethod (TIFF p1, ttag_t p2, ...);
 	************************************************************* */
-	[CCode (cname= "tileContigRoutine")]
-	public static delegate void TileContigRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar *p9);
-	[CCode (cname= "tileSeparateRoutine")]
-	public static delegate void TileSeparateRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar p9, uchar p10, uchar* p11, uchar* p12);
+	[CCode (cname = "tileContigRoutine", has_target = false)]
+	public delegate void TileContigRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar *p9);
+	[CCode (cname = "tileSeparateRoutine", has_target = false)]
+	public delegate void TileSeparateRoutine (RGBAImage p1, uint32[] p2, uint32 p3, uint32 p4, uint32 p5, uint32 p6, int32 p7, int32 p8, uchar p9, uchar p10, uchar* p11, uchar* p12);
 
 	public const ttag_t CIELABTORGB_TABLE_RANGE;
 	public const ttag_t CLEANFAXDATA_CLEAN;