Date: Tue, 2 Apr 2013 21:19:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1232 - in trunk/www/firefox: . files Message-ID: <201304022119.r32LJPkX058765@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Apr 2 21:19:25 2013 New Revision: 1232 Log: oops, put back dos2unix workaround Modified: trunk/www/firefox/Makefile trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Tue Apr 2 21:14:34 2013 (r1231) +++ trunk/www/firefox/Makefile Tue Apr 2 21:19:25 2013 (r1232) @@ -37,6 +37,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl +USE_DOS2UNIX= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp NO_MOZPKGINSTALL=yes FIREFOX_ICON= ${MOZILLA}.png Modified: trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp ============================================================================== --- trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Tue Apr 2 21:14:34 2013 (r1231) +++ trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Tue Apr 2 21:19:25 2013 (r1232) @@ -1,16 +1,16 @@ --- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp~ +++ media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -21,6 +21,13 @@ Scott McMurray - #include "constants.hpp" - #include <cstring> - -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if __FreeBSD_version < 900506 -+# define getchar boost_getchar -+# endif -+#endif -+ - namespace boost { - namespace detail { - //This only works on unsigned data types + #include "constants.hpp" + #include <cstring> + ++#ifdef __FreeBSD__ ++# include <osreldate.h> ++# if __FreeBSD_version < 900506 ++# define getchar boost_getchar ++# endif ++#endif ++ + namespace boost { + namespace detail { + //This only works on unsigned data types
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304022119.r32LJPkX058765>