[vlc-devel] commit: Remove broken lrint hack (fix: #3030) ( Rémi Denis-Courmont )

git version control git at videolan.org
Thu Aug 6 19:54:30 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  6 20:54:20 2009 +0300| [3b93130555ba60f5d2ae6c8b7040e10cbb120eb3] | committer: Rémi Denis-Courmont 

Remove broken lrint hack (fix: #3030)

(cherry picked from commit a924dfab2028a3ce8cd73d94f7da26594727d32f)

Conflicts:

	modules/gui/skins2/controls/ctrl_list.cpp
	modules/gui/skins2/controls/ctrl_tree.cpp

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b93130555ba60f5d2ae6c8b7040e10cbb120eb3
---

 modules/gui/skins2/controls/ctrl_list.cpp |    3 ---
 modules/gui/skins2/controls/ctrl_tree.cpp |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/modules/gui/skins2/controls/ctrl_list.cpp b/modules/gui/skins2/controls/ctrl_list.cpp
index 7bf3feb..c4c4cff 100644
--- a/modules/gui/skins2/controls/ctrl_list.cpp
+++ b/modules/gui/skins2/controls/ctrl_list.cpp
@@ -35,9 +35,6 @@
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_scroll.hpp"
 #include "vlc_keys.h"
-#ifdef sun
-#   include "solaris_specific.h" // for lrint
-#endif
 
 #define SCROLL_STEP 0.05f
 #define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines
diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index c2c5cdb..50b4675 100644
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -36,9 +36,6 @@
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_scroll.hpp"
 #include "vlc_keys.h"
-#ifdef sun
-#   include "solaris_specific.h" // for lrint
-#endif
 
 #define SCROLL_STEP 0.05
 #define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines




More information about the vlc-devel mailing list