[vala] Fix bindings to use the new syntax for fixed-length arrays
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vala] Fix bindings to use the new syntax for fixed-length arrays
- Date: Sun, 2 Aug 2009 20:40:30 +0000 (UTC)
commit 0beaf21a12326edae32f256a2ff57c4684c2ad43
Author: Evan Nemerson <evan polussystems com>
Date: Sat Aug 1 12:33:40 2009 -0700
Fix bindings to use the new syntax for fixed-length arrays
Fixes bug 590477.
vapi/fuse.vapi | 6 +++---
vapi/gsl.vapi | 20 ++++++++++----------
vapi/v4l2.vapi | 24 ++++++++++++------------
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/vapi/fuse.vapi b/vapi/fuse.vapi
index 8232b20..054bcd6 100644
--- a/vapi/fuse.vapi
+++ b/vapi/fuse.vapi
@@ -51,9 +51,9 @@ namespace Fuse {
}
[CCode (cname = "fuse_fill_dir_t")]
- public static delegate int FillDir (void* buf, string name, stat? st, off_t offset);
+ public static delegate int FillDir (void* buf, string name, Stat? st, off_t offset);
- public static delegate int GetAttr (string path, stat* st);
+ public static delegate int GetAttr (string path, 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, off_t offset, FileInfo fi);
@@ -67,7 +67,7 @@ namespace Fuse {
public static delegate int Chmod (string path, mode_t mode);
public static delegate int Chown (string path, uid_t uid, gid_t gid);
public static delegate int Truncate (string path, off_t size);
- public static delegate int Utimens (string path, timespec[2] ts);
+ public static delegate int Utimens (string path, timespec[] ts);
public static delegate int Open (string path, FileInfo fi);
public static delegate int Read (string path, char* buf, size_t size, off_t offset, FileInfo fi);
public static delegate int Write (string path, char* buf, size_t size, off_t offset, FileInfo fi);
diff --git a/vapi/gsl.vapi b/vapi/gsl.vapi
index 7529e5d..4ad89b1 100644
--- a/vapi/gsl.vapi
+++ b/vapi/gsl.vapi
@@ -2331,8 +2331,8 @@ namespace Gsl
{
public size_t n;
public size_t nf;
- public size_t[64] factor;
- public Complex[64] twiddle;
+ public size_t factor[64];
+ public Complex twiddle[64];
public Complex trig;
[CCode (cname="gsl_fft_complex_wavetable_alloc")]
@@ -2376,8 +2376,8 @@ namespace Gsl
{
public size_t n;
public size_t nf;
- public size_t[64] factor;
- public Complex[64] twiddle;
+ public size_t factor[64];
+ public Complex twiddle[64];
public Complex trig;
[CCode (cname="gsl_fft_real_wavetable_alloc")]
@@ -2410,8 +2410,8 @@ namespace Gsl
{
public size_t n;
public size_t nf;
- public size_t[64] factor;
- public Complex[64] twiddle;
+ public size_t factor[64];
+ public Complex twiddle[64];
public Complex trig;
[CCode (cname="gsl_fft_halfcomplex_wavetable_alloc")]
@@ -2481,10 +2481,10 @@ namespace Gsl
public double beta;
public int mu;
public int nu;
- public double[25] ri;
- public double[25] rj;
- public double[25] rg;
- public double[25] rh;
+ public double ri[25];
+ public double rj[25];
+ public double rg[25];
+ public double rh[25];
[CCode (cname="gsl_integration_qaws_table_alloc")]
public IntegrationQAWSTable (double alpha, double beta, int mu, int nu);
diff --git a/vapi/v4l2.vapi b/vapi/v4l2.vapi
index 25f4988..4b1a849 100644
--- a/vapi/v4l2.vapi
+++ b/vapi/v4l2.vapi
@@ -314,7 +314,7 @@ namespace V4l2
public uint8 seconds;
public uint8 minutes;
public uint8 hours;
- public uint8[4] userbits;
+ public uint8 userbits[4];
}
[CCode (cprefix="V4L2_TC_TYPE_")]
@@ -349,9 +349,9 @@ namespace V4l2
public int quality;
public int APPn;
public int APP_len;
- public char[60] APP_data;
+ public char APP_data[60];
public int COM_len;
- public char[60] COM_data;
+ public char COM_data[60];
public uint32 jpeg_markers;
}
@@ -1135,7 +1135,7 @@ namespace V4l2
{
public uint32 entries;
public uint32 entries_cap;
- public EncIdxEntry[V4L2_ENC_IDX_ENTRIES] entry;
+ public EncIdxEntry[] entry;
}
[CCode (cprefix="V4L2_ENC_CMD_")]
@@ -1151,7 +1151,7 @@ namespace V4l2
[CCode (cname="struct raw")]
public struct Raw
{
- public uint32[8] data;
+ public uint32 data[8];
}
[CCode (cname="struct v4l2_encoder_cmd")]
@@ -1169,8 +1169,8 @@ namespace V4l2
public uint32 offset;
public uint32 samples_per_line;
public uint32 sample_format;
- public int32[2] start;
- public uint32[2] count;
+ public int32 start[2];
+ public uint32 count[2];
public uint32 flags;
}
@@ -1185,7 +1185,7 @@ namespace V4l2
public struct SlicedVbiFormat
{
public uint16 service_set;
- public uint16[2, 24] service_lines;
+ public uint16[] service_lines;
public uint32 io_size;
public uint32[] reserved;
}
@@ -1206,7 +1206,7 @@ namespace V4l2
public struct SlicedVbiCap
{
public uint16 service_set;
- public uint16[2, 24] service_lines;
+ public uint16[] service_lines;
public BufferType type;
}
@@ -1216,7 +1216,7 @@ namespace V4l2
public uint32 id;
public uint32 field;
public uint32 line;
- public uint8[48] data;
+ public uint8 data[48];
}
public struct Fmt
@@ -1225,7 +1225,7 @@ namespace V4l2
public Window win;
public VbiFormat vbi;
public SlicedVbiFormat sliced;
- public uint8[200] raw_data;
+ public uint8 raw_data[200];
}
[CCode (cname="struct v4l2_format")]
@@ -1239,7 +1239,7 @@ namespace V4l2
{
public CaptureParm capture;
public OutputParm output;
- public uint8[200] raw_data;
+ public uint8 raw_data[200];
}
[CCode (cname="struct v4l2_streamparm")]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]