diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-09-05 15:50:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 15:50:29 -0400 |
| commit | 524e135573c83bddf4d6203e9edf1ed5f074c9cb (patch) | |
| tree | 7d8895f67febbcd866333be30ddfffff33542989 /ports | |
| parent | 8eddb60150286c318b79eb5df663aae23722eb24 (diff) | |
| parent | b6cddbebaa1b0f664cbd493c236ad2734f3b8d67 (diff) | |
| download | servo-524e135573c83bddf4d6203e9edf1ed5f074c9cb.tar.gz servo-524e135573c83bddf4d6203e9edf1ed5f074c9cb.zip | |
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Deduplicate parking_lot by updating it to 0.9
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24129)
<!-- Reviewable:end -->
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libsimpleservo/api/src/gl_glue.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/libsimpleservo/api/src/gl_glue.rs b/ports/libsimpleservo/api/src/gl_glue.rs index bc982959930..b52fcadad3d 100644 --- a/ports/libsimpleservo/api/src/gl_glue.rs +++ b/ports/libsimpleservo/api/src/gl_glue.rs @@ -15,9 +15,9 @@ pub mod egl { pub type EGLNativeWindowType = *const libc::c_void; pub type khronos_utime_nanoseconds_t = khronos_uint64_t; - pub type khronos_uint64_t = libc::uint64_t; + pub type khronos_uint64_t = u64; pub type khronos_ssize_t = libc::c_long; - pub type EGLint = libc::int32_t; + pub type EGLint = i32; pub type EGLContext = *const libc::c_void; pub type EGLNativeDisplayType = *const libc::c_void; pub type EGLNativePixmapType = *const libc::c_void; |