From f9a3c7f8f6954fbf9f1184d47bf96af0ea59f0bd Mon Sep 17 00:00:00 2001 From: fake Date: Sat, 18 Sep 2004 19:39:58 +0000 Subject: [PATCH] fake: nx-X11: gcc34.diff: copy over and adopt from the 'main' nxcomp. (makes it gcc32 compatible) [2004091603224903021] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4326 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/avm/nx-X11/gcc34.diff | 54 +++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/package/avm/nx-X11/gcc34.diff b/package/avm/nx-X11/gcc34.diff index e557745e0..e22de6747 100644 --- a/package/avm/nx-X11/gcc34.diff +++ b/package/avm/nx-X11/gcc34.diff @@ -1,11 +1,11 @@ ---- nxcomp/Types.h.orig Wed Sep 1 21:18:18 2004 -+++ nxcomp/Types.h Wed Sep 1 21:21:41 2004 -@@ -74,11 +74,11 @@ +--- nxcomp/Types.h.orig 2004-08-10 10:47:11.000000000 +0200 ++++ nxcomp/Types.h 2004-09-16 02:19:01.364333008 +0200 +@@ -74,22 +74,26 @@ void clear() { - #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H) ++ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H) - #if defined(__GLIBCPP_INTERNAL_VECTOR_H) + #if defined(_VECTOR_H) @@ -13,26 +13,32 @@ - _Destroy(_M_start, _M_finish); + _Destroy(_M_impl._M_start, _M_impl._M_finish); - #else +- #else ++ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); -@@ -86,9 +86,9 @@ +- destroy(_M_start, _M_finish); ++ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; - #endif +- #endif ++ #else -- _M_deallocate(_M_start, _M_end_of_storage - _M_start); -+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); + _M_deallocate(_M_start, _M_end_of_storage - _M_start); -- _M_start = _M_finish = _M_end_of_storage = 0; -+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; + _M_start = _M_finish = _M_end_of_storage = 0; ++ _Destroy(_M_start, _M_finish); ++ ++ #endif ++ #else -@@ -108,21 +108,21 @@ + destroy(start, finish); +@@ -108,22 +112,28 @@ void clear() { - #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H) ++ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H) - #if defined(__GLIBCPP_INTERNAL_VECTOR_H) + #if defined(_VECTOR_H) @@ -40,22 +46,28 @@ - _Destroy(_M_start, _M_finish); + _Destroy(_M_impl._M_start, _M_impl._M_finish); - #else +- #else ++ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); - destroy(_M_start, _M_finish); -+ destroy(_M_impl._M_start, _M_impl._M_finish); ++ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; - #endif +- #endif ++ #else -- _M_deallocate(_M_start, _M_end_of_storage - _M_start); -+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); + _M_deallocate(_M_start, _M_end_of_storage - _M_start); -- _M_start = _M_finish = _M_end_of_storage = 0; -+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; + _M_start = _M_finish = _M_end_of_storage = 0; ++ _Destroy(_M_start, _M_finish); ++ ++ #endif ++ ++ ++ #else - + destroy(start, finish); --- nxcomp/Jpeg.cpp.orig 2004-09-13 03:41:49.905274168 +0200 +++ nxcomp/Jpeg.cpp 2004-09-13 03:43:06.886571232 +0200 @@ -452,7 +452,7 @@