auto merge of rust-lang#17424 : ville-h/rust/rtld_rename, r=alexcrichton

bors · bors · commit 72841b128df8 · 2014-09-21T20:00:29.000Z
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
@@ -260,7 +260,7 @@ pub mod dl {
         dlclose(handle as *mut libc::c_void); ()
     }
 
-    pub enum RTLD {
+    pub enum Rtld {
         Lazy = 1,
         Now = 2,
         Global = 256,

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ pub mod dl {`
`260`	`260`	`dlclose(handle as *mut libc::c_void); ()`
`261`	`261`	`}`
`262`	`262`
`263`		`- pub enum RTLD {`
	`263`	`+ pub enum Rtld {`
`264`	`264`	`Lazy = 1,`
`265`	`265`	`Now = 2,`
`266`	`266`	`Global = 256,`