Merge branch 'master' of pwrcvs:/data1/git/pwr

profibus/lib/cow/src/cow_pn_gsdml.cpp

@@ -39,12 +39,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <float.h>
+#include <stddef.h>
 
 #include "co_dcli.h"
 #include "cow_pn_gsdml.h"
 #include "rt_pb_msg.h"
 #include "pwr_baseclasses.h"
 
+
 static char noref[] = "Unresolved reference";
 
 typedef enum {

src/tools/pkg/ubu/pwr/control

@@ -3,9 +3,9 @@ Section: devel
 Package: pwr48
 Priority: optional
 Maintainer: Proview <postmaster@proview.se>
-Version: 4.8.2-1
+Version: 4.8.3-1
 Architecture: i386
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libdb4.8++ (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.5.2-1ubuntu3), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), libdb4.8++ (>=5.1.25-11), libmysql++3 (>= 3.1.0-1ubuntu1), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Homepage: http://www.proview.se
 Installed-Size: 1114020
@@ -33,3 +33,6 @@ Description: Proview development and runtime environment package
    - Support for Hilscher cifX Profinet Controller.
    - UDP communication configured with IO objects.
    - Support for USB joystick.
+ - 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.

src/tools/pkg/ubu/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr48 (>= 4.8.2-1)
+Depends: pwr48 (>= 4.8.3-1)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se

src/tools/pkg/ubu/pwrrt/control

 Package: pwrrt
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se
@@ -20,3 +20,6 @@ Description:
    - Curve window, second mark and export dialog added.
    - Xtt, problems with OpPlace and XttGraph objects in SharedVolume fixed.
    - Flow alloc color problem fixed.
+ 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.

src/tools/pkg/ubu/pwrsev/control

 Package: pwrsev
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), libmysql++3 (>= 3.1.0-1ubuntu1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se

src/tools/pkg/ubu_x86_64/pwr/control

+Source: pwrsrc
+Section: devel
 Package: pwr48
-Version: 4.8.2-1
-Section: base
 Priority: optional
+Maintainer: Proview <postmaster@proview.se>
+Version: 4.8.3-1
 Architecture: amd64
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libdb4.8++ (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.5.2-1ubuntu3), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), libdb4.8++ (>=5.1.25-11), libmysql++3 (>= 3.1.0-1ubuntu1), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
-Maintainer: Proview <postmaster@proview.se>
+Homepage: http://www.proview.se
+Installed-Size: 1114020
 Description: Proview development and runtime environment package
  Proview development and runtime environment
  4.8.0-1 Base release 
@@ -30,3 +33,6 @@ Description: Proview development and runtime environment package
    - Support for Hilscher cifX Profinet Controller.
    - UDP communication configured with IO objects.
    - Support for USB joystick.
+ 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.

src/tools/pkg/ubu_x86_64/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: pwr48 (>= 4.8.2-1)
+Depends: pwr48 (>= 4.8.3-1)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package

src/tools/pkg/ubu_x86_64/pwrrt/control

 Package: pwrrt
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
+Homepage: http://www.proview.se
+Installed-Size: 955344
 Description:
  Proview runtime environment
  4.8.0-1 Base release
@@ -18,3 +20,6 @@ Description:
    - Curve window, second mark and export dialog added.
    - Xtt, problems with OpPlace and XttGraph objects in SharedVolume fixed.
    - Flow alloc color problem fixed.
+ 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.

src/tools/pkg/ubu_x86_64/pwrsev/control

 Package: pwrsev
-Version: 4.8.2-1
+Version: 4.8.3-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.13-0ubuntu13), libgtk2.0-0 (>= 2.24.4-0ubuntu2), libasound2 (>= 1.0.24.1-0ubuntu5), libdb4.8 (>=4.8.30-5ubuntu2), libmysql++3 (>= 3.0.9-1ubuntu2), xfonts-100dpi
+Depends: libc6 (>= 2.13-20ubuntu5), libgtk2.0-0 (>= 2.24.6-0ubuntu5), libasound2 (>= 1.0.24.1-0ubuntu10), libdb5.1 (>=5.1.25-11), libmysql++3 (>= 3.1.0-1ubuntu1), xfonts-100dpi
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Description:

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -356,11 +356,11 @@ else
   #Gtk
   echo ""
   echo "Mandatory :"
-  pwre_config_check_lib gtk    	  GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so"
+  pwre_config_check_lib gtk    	  GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-gnu/libgtk-x11-2.0.so"
 
   pwre_config_check_lib libantlr  LIBANTLR lib wb 0 "/usr/lib/libantlr.a:/usr/local/lib/libantlr.a"
   pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-gnu/librpcsvc.a"
-  pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a"
+  pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-gnu/libasound.so"
   pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 "/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/$hwpl-linux-gnu/libpthread.so"
   pwre_config_check_lib libm      LIBM     lib lib 0 "/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/$hwpl-linux-gnu/libm.so"
   pwre_config_check_lib libdb     LIBDB    lib lib 0 "/usr/lib/libdb.so:/usr/lib/$hwpl-linux-gnu/libdb.so"
@@ -384,7 +384,7 @@ else
   pwre_config_check_lib mq        MQ       lib mq  1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
   pwre_config_check_lib wmq       WMQ      lib wmq 1 "/usr/lib/libmqic.so"
   pwre_config_check_lib libpnioif PNAK     lib pnak 1 "/usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a"
-  pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so"
+  pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-gnu/libusb-1.0.so"
 
   pwre_config_check_include mq    MQ    0 "/usr/local/dmq/include/p_entry.h"
   pwre_config_check_include wmq   WMQ   1 "/opt/mqm/inc/cmqc.h"

xtt/lib/xtt/src/xtt_hist.cpp

@@ -293,7 +293,7 @@ void Hist::get_hist_list()
     return;
   }
 
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
+#if DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR > 0
   //        int  (*open) __P((DB *, DB_TXN *,
   //              const char *, const char *, DBTYPE, u_int32_t, int));