Skip to content

Commit a7becd3

Browse files
crumblingstatuecrumblingstatue
committed
Use c_char instead of c_schar where CSFML uses char
See rust-lang/rust-bindgen#603
1 parent a58cfcb commit a7becd3

File tree

5 files changed

+95
-95
lines changed

5 files changed

+95
-95
lines changed

‎ffi/csfml-audio-sys/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl Clone for max_align_t {
7777
fn clone(&self) -> Self { *self }
7878
}
7979
extern "C" {
80-
pub fn sfMusic_createFromFile(filename: *const ::std::os::raw::c_schar)
80+
pub fn sfMusic_createFromFile(filename: *const ::std::os::raw::c_char)
8181
-> *mut sfMusic;
8282
}
8383
extern "C" {
@@ -242,7 +242,7 @@ extern "C" {
242242
}
243243
extern "C" {
244244
pub fn sfSoundBuffer_createFromFile(filename:
245-
*const ::std::os::raw::c_schar)
245+
*const ::std::os::raw::c_char)
246246
-> *mut sfSoundBuffer;
247247
}
248248
extern "C" {
@@ -271,7 +271,7 @@ extern "C" {
271271
}
272272
extern "C" {
273273
pub fn sfSoundBuffer_saveToFile(soundBuffer: *const sfSoundBuffer,
274-
filename: *const ::std::os::raw::c_schar)
274+
filename: *const ::std::os::raw::c_char)
275275
-> sfBool;
276276
}
277277
extern "C" {
@@ -325,13 +325,13 @@ extern "C" {
325325
pub fn sfSoundBufferRecorder_setDevice(soundBufferRecorder:
326326
*mut sfSoundBufferRecorder,
327327
name:
328-
*const ::std::os::raw::c_schar)
328+
*const ::std::os::raw::c_char)
329329
-> sfBool;
330330
}
331331
extern "C" {
332332
pub fn sfSoundBufferRecorder_getDevice(soundBufferRecorder:
333333
*mut sfSoundBufferRecorder)
334-
-> *const ::std::os::raw::c_schar;
334+
-> *const ::std::os::raw::c_char;
335335
}
336336
pub type sfSoundRecorderStartCallback =
337337
::std::option::Option<unsafe extern "C" fn(arg1:
@@ -379,20 +379,20 @@ extern "C" {
379379
}
380380
extern "C" {
381381
pub fn sfSoundRecorder_getAvailableDevices(count: *mut usize)
382-
-> *mut *const ::std::os::raw::c_schar;
382+
-> *mut *const ::std::os::raw::c_char;
383383
}
384384
extern "C" {
385385
pub fn sfSoundRecorder_getDefaultDevice()
386-
-> *const ::std::os::raw::c_schar;
386+
-> *const ::std::os::raw::c_char;
387387
}
388388
extern "C" {
389389
pub fn sfSoundRecorder_setDevice(soundRecorder: *mut sfSoundRecorder,
390-
name: *const ::std::os::raw::c_schar)
390+
name: *const ::std::os::raw::c_char)
391391
-> sfBool;
392392
}
393393
extern "C" {
394394
pub fn sfSoundRecorder_getDevice(soundRecorder: *mut sfSoundRecorder)
395-
-> *const ::std::os::raw::c_schar;
395+
-> *const ::std::os::raw::c_char;
396396
}
397397
extern "C" {
398398
pub fn sfSoundRecorder_setChannelCount(soundRecorder:

‎ffi/csfml-graphics-sys/src/lib.rs

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ extern "C" {
667667
#[repr(C)]
668668
#[derive(Debug, Copy)]
669669
pub struct sfFontInfo {
670-
pub family: *const ::std::os::raw::c_schar,
670+
pub family: *const ::std::os::raw::c_char,
671671
}
672672
#[test]
673673
fn bindgen_test_layout_sfFontInfo() {
@@ -717,7 +717,7 @@ impl Clone for sfGlyph {
717717
fn clone(&self) -> Self { *self }
718718
}
719719
extern "C" {
720-
pub fn sfFont_createFromFile(filename: *const ::std::os::raw::c_schar)
720+
pub fn sfFont_createFromFile(filename: *const ::std::os::raw::c_char)
721721
-> *mut sfFont;
722722
}
723723
extern "C" {
@@ -781,7 +781,7 @@ extern "C" {
781781
pixels: *const sfUint8) -> *mut sfImage;
782782
}
783783
extern "C" {
784-
pub fn sfImage_createFromFile(filename: *const ::std::os::raw::c_schar)
784+
pub fn sfImage_createFromFile(filename: *const ::std::os::raw::c_char)
785785
-> *mut sfImage;
786786
}
787787
extern "C" {
@@ -800,7 +800,7 @@ extern "C" {
800800
}
801801
extern "C" {
802802
pub fn sfImage_saveToFile(image: *const sfImage,
803-
filename: *const ::std::os::raw::c_schar)
803+
filename: *const ::std::os::raw::c_char)
804804
-> sfBool;
805805
}
806806
extern "C" {
@@ -1184,7 +1184,7 @@ extern "C" {
11841184
}
11851185
extern "C" {
11861186
pub fn sfRenderWindow_create(mode: sfVideoMode,
1187-
title: *const ::std::os::raw::c_schar,
1187+
title: *const ::std::os::raw::c_char,
11881188
style: sfUint32,
11891189
settings: *const sfContextSettings)
11901190
-> *mut sfRenderWindow;
@@ -1241,7 +1241,7 @@ extern "C" {
12411241
}
12421242
extern "C" {
12431243
pub fn sfRenderWindow_setTitle(renderWindow: *mut sfRenderWindow,
1244-
title: *const ::std::os::raw::c_schar);
1244+
title: *const ::std::os::raw::c_char);
12451245
}
12461246
extern "C" {
12471247
pub fn sfRenderWindow_setUnicodeTitle(renderWindow: *mut sfRenderWindow,
@@ -1654,20 +1654,20 @@ impl Clone for sfGlslMat4 {
16541654
}
16551655
extern "C" {
16561656
pub fn sfShader_createFromFile(vertexShaderFilename:
1657-
*const ::std::os::raw::c_schar,
1657+
*const ::std::os::raw::c_char,
16581658
geometryShaderFilename:
1659-
*const ::std::os::raw::c_schar,
1659+
*const ::std::os::raw::c_char,
16601660
fragmentShaderFilename:
1661-
*const ::std::os::raw::c_schar)
1661+
*const ::std::os::raw::c_char)
16621662
-> *mut sfShader;
16631663
}
16641664
extern "C" {
16651665
pub fn sfShader_createFromMemory(vertexShader:
1666-
*const ::std::os::raw::c_schar,
1666+
*const ::std::os::raw::c_char,
16671667
geometryShader:
1668-
*const ::std::os::raw::c_schar,
1668+
*const ::std::os::raw::c_char,
16691669
fragmentShader:
1670-
*const ::std::os::raw::c_schar)
1670+
*const ::std::os::raw::c_char)
16711671
-> *mut sfShader;
16721672
}
16731673
extern "C" {
@@ -1681,180 +1681,180 @@ extern "C" {
16811681
}
16821682
extern "C" {
16831683
pub fn sfShader_setFloatUniform(shader: *mut sfShader,
1684-
name: *const ::std::os::raw::c_schar,
1684+
name: *const ::std::os::raw::c_char,
16851685
x: f32);
16861686
}
16871687
extern "C" {
16881688
pub fn sfShader_setVec2Uniform(shader: *mut sfShader,
1689-
name: *const ::std::os::raw::c_schar,
1689+
name: *const ::std::os::raw::c_char,
16901690
vector: sfGlslVec2);
16911691
}
16921692
extern "C" {
16931693
pub fn sfShader_setVec3Uniform(shader: *mut sfShader,
1694-
name: *const ::std::os::raw::c_schar,
1694+
name: *const ::std::os::raw::c_char,
16951695
vector: sfGlslVec3);
16961696
}
16971697
extern "C" {
16981698
pub fn sfShader_setVec4Uniform(shader: *mut sfShader,
1699-
name: *const ::std::os::raw::c_schar,
1699+
name: *const ::std::os::raw::c_char,
17001700
vector: sfGlslVec4);
17011701
}
17021702
extern "C" {
17031703
pub fn sfShader_setColorUniform(shader: *mut sfShader,
1704-
name: *const ::std::os::raw::c_schar,
1704+
name: *const ::std::os::raw::c_char,
17051705
color: sfColor);
17061706
}
17071707
extern "C" {
17081708
pub fn sfShader_setIntUniform(shader: *mut sfShader,
1709-
name: *const ::std::os::raw::c_schar,
1709+
name: *const ::std::os::raw::c_char,
17101710
x: ::std::os::raw::c_int);
17111711
}
17121712
extern "C" {
17131713
pub fn sfShader_setIvec2Uniform(shader: *mut sfShader,
1714-
name: *const ::std::os::raw::c_schar,
1714+
name: *const ::std::os::raw::c_char,
17151715
vector: sfGlslIvec2);
17161716
}
17171717
extern "C" {
17181718
pub fn sfShader_setIvec3Uniform(shader: *mut sfShader,
1719-
name: *const ::std::os::raw::c_schar,
1719+
name: *const ::std::os::raw::c_char,
17201720
vector: sfGlslIvec3);
17211721
}
17221722
extern "C" {
17231723
pub fn sfShader_setIvec4Uniform(shader: *mut sfShader,
1724-
name: *const ::std::os::raw::c_schar,
1724+
name: *const ::std::os::raw::c_char,
17251725
vector: sfGlslIvec4);
17261726
}
17271727
extern "C" {
17281728
pub fn sfShader_setIntColorUniform(shader: *mut sfShader,
1729-
name: *const ::std::os::raw::c_schar,
1729+
name: *const ::std::os::raw::c_char,
17301730
color: sfColor);
17311731
}
17321732
extern "C" {
17331733
pub fn sfShader_setBoolUniform(shader: *mut sfShader,
1734-
name: *const ::std::os::raw::c_schar,
1734+
name: *const ::std::os::raw::c_char,
17351735
x: sfBool);
17361736
}
17371737
extern "C" {
17381738
pub fn sfShader_setBvec2Uniform(shader: *mut sfShader,
1739-
name: *const ::std::os::raw::c_schar,
1739+
name: *const ::std::os::raw::c_char,
17401740
vector: sfGlslBvec2);
17411741
}
17421742
extern "C" {
17431743
pub fn sfShader_setBvec3Uniform(shader: *mut sfShader,
1744-
name: *const ::std::os::raw::c_schar,
1744+
name: *const ::std::os::raw::c_char,
17451745
vector: sfGlslBvec3);
17461746
}
17471747
extern "C" {
17481748
pub fn sfShader_setBvec4Uniform(shader: *mut sfShader,
1749-
name: *const ::std::os::raw::c_schar,
1749+
name: *const ::std::os::raw::c_char,
17501750
vector: sfGlslBvec4);
17511751
}
17521752
extern "C" {
17531753
pub fn sfShader_setMat3Uniform(shader: *mut sfShader,
1754-
name: *const ::std::os::raw::c_schar,
1754+
name: *const ::std::os::raw::c_char,
17551755
matrix: *const sfGlslMat3);
17561756
}
17571757
extern "C" {
17581758
pub fn sfShader_setMat4Uniform(shader: *mut sfShader,
1759-
name: *const ::std::os::raw::c_schar,
1759+
name: *const ::std::os::raw::c_char,
17601760
matrix: *const sfGlslMat4);
17611761
}
17621762
extern "C" {
17631763
pub fn sfShader_setTextureUniform(shader: *mut sfShader,
1764-
name: *const ::std::os::raw::c_schar,
1764+
name: *const ::std::os::raw::c_char,
17651765
texture: *const sfTexture);
17661766
}
17671767
extern "C" {
17681768
pub fn sfShader_setCurrentTextureUniform(shader: *mut sfShader,
17691769
name:
1770-
*const ::std::os::raw::c_schar);
1770+
*const ::std::os::raw::c_char);
17711771
}
17721772
extern "C" {
17731773
pub fn sfShader_setFloatUniformArray(shader: *mut sfShader,
1774-
name: *const ::std::os::raw::c_schar,
1774+
name: *const ::std::os::raw::c_char,
17751775
scalarArray: *const f32,
17761776
length: usize);
17771777
}
17781778
extern "C" {
17791779
pub fn sfShader_setVec2UniformArray(shader: *mut sfShader,
1780-
name: *const ::std::os::raw::c_schar,
1780+
name: *const ::std::os::raw::c_char,
17811781
vectorArray: *const sfGlslVec2,
17821782
length: usize);
17831783
}
17841784
extern "C" {
17851785
pub fn sfShader_setVec3UniformArray(shader: *mut sfShader,
1786-
name: *const ::std::os::raw::c_schar,
1786+
name: *const ::std::os::raw::c_char,
17871787
vectorArray: *const sfGlslVec3,
17881788
length: usize);
17891789
}
17901790
extern "C" {
17911791
pub fn sfShader_setVec4UniformArray(shader: *mut sfShader,
1792-
name: *const ::std::os::raw::c_schar,
1792+
name: *const ::std::os::raw::c_char,
17931793
vectorArray: *const sfGlslVec4,
17941794
length: usize);
17951795
}
17961796
extern "C" {
17971797
pub fn sfShader_setMat3UniformArray(shader: *mut sfShader,
1798-
name: *const ::std::os::raw::c_schar,
1798+
name: *const ::std::os::raw::c_char,
17991799
matrixArray: *const sfGlslMat3,
18001800
length: usize);
18011801
}
18021802
extern "C" {
18031803
pub fn sfShader_setMat4UniformArray(shader: *mut sfShader,
1804-
name: *const ::std::os::raw::c_schar,
1804+
name: *const ::std::os::raw::c_char,
18051805
matrixArray: *const sfGlslMat4,
18061806
length: usize);
18071807
}
18081808
extern "C" {
18091809
pub fn sfShader_setFloatParameter(shader: *mut sfShader,
1810-
name: *const ::std::os::raw::c_schar,
1810+
name: *const ::std::os::raw::c_char,
18111811
x: f32);
18121812
}
18131813
extern "C" {
18141814
pub fn sfShader_setFloat2Parameter(shader: *mut sfShader,
1815-
name: *const ::std::os::raw::c_schar,
1815+
name: *const ::std::os::raw::c_char,
18161816
x: f32, y: f32);
18171817
}
18181818
extern "C" {
18191819
pub fn sfShader_setFloat3Parameter(shader: *mut sfShader,
1820-
name: *const ::std::os::raw::c_schar,
1820+
name: *const ::std::os::raw::c_char,
18211821
x: f32, y: f32, z: f32);
18221822
}
18231823
extern "C" {
18241824
pub fn sfShader_setFloat4Parameter(shader: *mut sfShader,
1825-
name: *const ::std::os::raw::c_schar,
1825+
name: *const ::std::os::raw::c_char,
18261826
x: f32, y: f32, z: f32, w: f32);
18271827
}
18281828
extern "C" {
18291829
pub fn sfShader_setVector2Parameter(shader: *mut sfShader,
1830-
name: *const ::std::os::raw::c_schar,
1830+
name: *const ::std::os::raw::c_char,
18311831
vector: sfVector2f);
18321832
}
18331833
extern "C" {
18341834
pub fn sfShader_setVector3Parameter(shader: *mut sfShader,
1835-
name: *const ::std::os::raw::c_schar,
1835+
name: *const ::std::os::raw::c_char,
18361836
vector: sfVector3f);
18371837
}
18381838
extern "C" {
18391839
pub fn sfShader_setColorParameter(shader: *mut sfShader,
1840-
name: *const ::std::os::raw::c_schar,
1840+
name: *const ::std::os::raw::c_char,
18411841
color: sfColor);
18421842
}
18431843
extern "C" {
18441844
pub fn sfShader_setTransformParameter(shader: *mut sfShader,
18451845
name:
1846-
*const ::std::os::raw::c_schar,
1846+
*const ::std::os::raw::c_char,
18471847
transform: sfTransform);
18481848
}
18491849
extern "C" {
18501850
pub fn sfShader_setTextureParameter(shader: *mut sfShader,
1851-
name: *const ::std::os::raw::c_schar,
1851+
name: *const ::std::os::raw::c_char,
18521852
texture: *const sfTexture);
18531853
}
18541854
extern "C" {
18551855
pub fn sfShader_setCurrentTextureParameter(shader: *mut sfShader,
18561856
name:
1857-
*const ::std::os::raw::c_schar);
1857+
*const ::std::os::raw::c_char);
18581858
}
18591859
extern "C" {
18601860
pub fn sfShader_getNativeHandle(shader: *const sfShader)
@@ -2107,7 +2107,7 @@ extern "C" {
21072107
}
21082108
extern "C" {
21092109
pub fn sfText_setString(text: *mut sfText,
2110-
string: *const ::std::os::raw::c_schar);
2110+
string: *const ::std::os::raw::c_char);
21112111
}
21122112
extern "C" {
21132113
pub fn sfText_setUnicodeString(text: *mut sfText,
@@ -2137,7 +2137,7 @@ extern "C" {
21372137
}
21382138
extern "C" {
21392139
pub fn sfText_getString(text: *const sfText)
2140-
-> *const ::std::os::raw::c_schar;
2140+
-> *const ::std::os::raw::c_char;
21412141
}
21422142
extern "C" {
21432143
pub fn sfText_getUnicodeString(text: *const sfText) -> *const sfUint32;
@@ -2179,7 +2179,7 @@ extern "C" {
21792179
height: ::std::os::raw::c_uint) -> *mut sfTexture;
21802180
}
21812181
extern "C" {
2182-
pub fn sfTexture_createFromFile(filename: *const ::std::os::raw::c_schar,
2182+
pub fn sfTexture_createFromFile(filename: *const ::std::os::raw::c_char,
21832183
area: *const sfIntRect) -> *mut sfTexture;
21842184
}
21852185
extern "C" {

0 commit comments

Comments
 (0)