From 8ada9e89ded2f93b64be164ada7bb8a8da7c1e0b Mon Sep 17 00:00:00 2001
From: Frederik Zipp <fzipp@gmx.de>
Date: Sun, 21 Mar 2010 07:34:20 +0100
Subject: [PATCH] sdl, tiff: Do not use `weak' modifier where it is not
 applicable

Fixes bug 613426.
---
 vapi/sdl-image.vapi |  2 +-
 vapi/sdl-mixer.vapi |  2 +-
 vapi/sdl-ttf.vapi   |  2 +-
 vapi/sdl.vapi       | 20 ++++++++++----------
 vapi/tiff.vapi      |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/vapi/sdl-image.vapi b/vapi/sdl-image.vapi
index 954d7dafa..a31c11959 100644
--- a/vapi/sdl-image.vapi
+++ b/vapi/sdl-image.vapi
@@ -1,7 +1,7 @@
 [CCode (cheader_filename="SDL_image.h")]
 namespace SDLImage {
 	[CCode (cname="IMG_Linked_Version")]
-	public static weak SDL.Version linked();
+	public static unowned SDL.Version linked();
 
 	[CCode (cname="IMG_LoadTyped_RW")]
 	public static SDL.Surface load_rw_typed(SDL.RWops src, int freesrc=0, string type);
diff --git a/vapi/sdl-mixer.vapi b/vapi/sdl-mixer.vapi
index dcb600bfa..8122294d0 100644
--- a/vapi/sdl-mixer.vapi
+++ b/vapi/sdl-mixer.vapi
@@ -1,7 +1,7 @@
 [CCode (cheader_filename="SDL_mixer.h")]
 namespace SDLMixer {
 	[CCode (cname="Mix_Linked_Version")]
-	public static weak SDL.Version linked();
+	public static unowned SDL.Version linked();
 
 	[CCode (cname="Mix_OpenAudio")]
 	public static int open(int frequency, uint16 format, int channels, int chunksize);
diff --git a/vapi/sdl-ttf.vapi b/vapi/sdl-ttf.vapi
index 449f158b4..78f36b328 100644
--- a/vapi/sdl-ttf.vapi
+++ b/vapi/sdl-ttf.vapi
@@ -1,7 +1,7 @@
 [CCode (cheader_filename="SDL_ttf.h")]
 namespace SDLTTF {
 	[CCode (cname="TTF_Linked_Version")]
-	public static weak SDL.Version linked();
+	public static unowned SDL.Version linked();
 
 	[CCode (cname="TTF_ByteSwappedUNICODE")]
 	public static void byteswap_unicode(int swapped);
diff --git a/vapi/sdl.vapi b/vapi/sdl.vapi
index a965f1881..22fea24e0 100644
--- a/vapi/sdl.vapi
+++ b/vapi/sdl.vapi
@@ -31,7 +31,7 @@ namespace SDL {
 		public uchar patch;
 
 		[CCode (cheader_filename="SDL_version.h", cname="SDL_Linked_Version")]
-		public static weak Version linked();
+		public static unowned Version linked();
 	}// Version
 
 
@@ -48,7 +48,7 @@ namespace SDL {
 	public static void set_error(string format, ...);
 
 	[CCode (cname="SDL_GetError")]
-	public static weak string get_error();
+	public static unowned string get_error();
 
 	[CCode (cname="SDL_ClearError")]
 	public static void clear_error();
@@ -68,7 +68,7 @@ namespace SDL {
 	[Compact]
 	public class Video {
 		[CCode (cname="SDL_VideoDriverName")]
-		public static weak string? driver_name(string namebuf, int maxlen);
+		public static unowned string? driver_name(string namebuf, int maxlen);
 
 		[CCode (cname="SDL_SetGamma")]
 		public static int set_gamma(float red, float green, float blue);
@@ -163,10 +163,10 @@ namespace SDL {
 	[Compact]
 	public class Screen : Surface {
 		[CCode (cname="SDL_GetVideoSurface")]
-		public static weak Screen instance();
+		public static unowned Screen instance();
 
 		[CCode (cname="SDL_SetVideoMode")]
-		public static weak Screen? set_video_mode(int width, int height, int bpp, uint32 flags);
+		public static unowned Screen? set_video_mode(int width, int height, int bpp, uint32 flags);
 
 		[CCode (cname="SDL_VideoModeOK")]
 		public static int check_video_mode(int width, int height, int bpp, uint32 flags);
@@ -258,7 +258,7 @@ namespace SDL {
 		public int	current_h;
 
 		[CCode (cname="SDL_GetVideoInfo")]
-		public static weak VideoInfo get();
+		public static unowned VideoInfo get();
 	}// VideoInfo
 
 	[CCode (cname="int", cprefix="SDL_")]
@@ -577,7 +577,7 @@ namespace SDL {
 		public static void get_repeat(ref int delay, ref int interval);
 
 		[CCode (cname="SDL_GetKeyState")]
-		public static weak uchar[] get_keys();
+		public static unowned uchar[] get_keys();
 
 		[CCode (cname="SDL_GetModState")]
 		public static KeyModifier get_modifiers();
@@ -586,7 +586,7 @@ namespace SDL {
 		public static void set_modifiers(KeyModifier modstate);
 
 		[CCode (cname="SDL_GetKeyName")]
-		public static weak string get_name(KeySymbol key);
+		public static unowned string get_name(KeySymbol key);
 	}// Key
 
 	[CCode (cname="int", cprefix="SDLK_", cheader_filename="SDL_keysym.h")]
@@ -915,7 +915,7 @@ namespace SDL {
 	[Compact]
 	public class Joystick {
 		[CCode (cname="SDL_JoystickName")]
-		public static weak string get_name(int device_index);
+		public static unowned string get_name(int device_index);
 
 		[CCode (cname="SDL_JoystickOpened")]
 		public static int is_open(int device_index);
@@ -1016,7 +1016,7 @@ namespace SDL {
 	[Compact]
 	public class Audio {
 		[CCode (cname="SDL_AudioDriverName")]
-		public static weak string driver_name(string namebuf, int maxlen);
+		public static unowned string driver_name(string namebuf, int maxlen);
 		
 		[CCode (cname="SDL_OpenAudio")]
 		public static int open(AudioSpec desired, AudioSpec obtained);
diff --git a/vapi/tiff.vapi b/vapi/tiff.vapi
index f5ef308cb..dfabfc927 100644
--- a/vapi/tiff.vapi
+++ b/vapi/tiff.vapi
@@ -818,11 +818,11 @@ namespace Tiff {
 		[CCode (cname = "TIFFFdOpen")]
 		public static TIFF FdOpen (int p1, string p2, string p3);
 		[CCode (cname = "TIFFGetVersion")]
-		public static weak string GetVersion ();
+		public static unowned string GetVersion ();
 		[CCode (cname = "TIFFFindCODEC")]
-		public static weak Codec FindCODEC (ushort p1);
+		public static unowned Codec FindCODEC (ushort p1);
 		[CCode (cname = "TIFFGetBitRevTable")]
-		public static weak string GetBitRevTable (int p1);
+		public static unowned string GetBitRevTable (int p1);
 		[CCode (cname = "TIFFGetConfiguredCODECs")]
 		public static Codec GetConfiguredCODECs ();
 		[CCode (cname = "TIFFRGBAImageBegin")]
-- 
2.47.2