From: Nabil Ghodbane Date: Tue, 30 Apr 2024 13:46:03 +0000 (+0200) Subject: spns #41486 - omniORB 4.2.3 and Visual 2019 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b673922649a0c531932586e1e6f3a6960570cf86;p=tools%2Fsat_salome.git spns #41486 - omniORB 4.2.3 and Visual 2019 --- diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf index 10cc1b3..1972618 100644 --- a/products/omniORB.pyconf +++ b/products/omniORB.pyconf @@ -25,6 +25,16 @@ version_4_2_3_win_dbg: patches: ['omniORB-4.2.3-windows-debug.patch'] } +version_4_2_3 : +{ + patches: [] +} + +version_4_2_3_win: +{ + patches: ['omniORB-4.2.3-windows-visual-2019.patch'] +} + version_4_2_5: { patches: ['omniORB-4.2.5.p1.patch'] diff --git a/products/patches/omniORB-4.2.3-windows-visual-2019.patch b/products/patches/omniORB-4.2.3-windows-visual-2019.patch new file mode 100644 index 0000000..396e446 --- /dev/null +++ b/products/patches/omniORB-4.2.3-windows-visual-2019.patch @@ -0,0 +1,19 @@ +--- omniORB-4.2.3_ref/include/omnithread/pthread_nt.h 2017-02-20 23:45:59.000000000 +0100 ++++ omniORB-4.2.3_dev/include/omnithread/pthread_nt.h 2024-04-30 15:42:19.247133200 +0200 +@@ -42,6 +42,7 @@ + extern "C" { + #endif + ++#ifndef HAVE_STRUCT_TIMESPEC + #ifndef _TIMERS_T_ + #define _TIMERS_T_ + typedef struct timespec { +@@ -49,7 +50,7 @@ + long tv_nsec; + } timespec_t; + #endif +- ++#endif // HAVE_STRUCT_TIMESPEC + typedef char* __pthreadLongString_t; + typedef void* __pthreadLongAddr_t; + typedef __pthreadLongAddr_t* __pthreadLongAddr_p;