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

src/doc/dox/src/os_linux/hw_x86/makefile

@@ -40,7 +40,7 @@ $(clean_html) : clean_%.html : %.html
 
 $(doc_dir)/dox/index.html : ../../doxygen.dx
 	@ echo "doxygen documentation $(source) $(target)"
-	@ doxygen
+	@ doxygen 2> /dev/null 
 
 
 

src/doc/dox/src/os_linux/hw_x86_64/makefile

@@ -40,7 +40,7 @@ $(clean_html) : clean_%.html : %.html
 
 $(doc_dir)/dox/index.html : ../../doxygen.dx
 	@ echo "doxygen documentation $(source) $(target)"
-	@ doxygen
+	@ doxygen 2> /dev/null 
 
 
 

src/doc/dox/src/os_macos/hw_x86_64/makefile

@@ -40,7 +40,7 @@ $(clean_html) : clean_%.html : %.html
 
 $(doc_dir)/dox/index.html : ../../doxygen.dx
 	@ echo "doxygen documentation $(source) $(target)"
-	@ doxygen
+	@ doxygen 2> /dev/null 
 
 
 

src/exe/rt_tmon/src/rt_tmon.c

@@ -274,7 +274,7 @@ main (
       tmo_ms = 0;
     }
 
-#ifdef OS_LINUX || defined OS_MACOS
+#if defined OS_LINUX || defined OS_MACOS
     get.data = NULL;
     qcom_Get(&sts, &my_q, &get, tmo_ms);
     if (sts != QCOM__TMO && sts != QCOM__QEMPTY) {

src/exp/rt/src/rt_plc_process.c

@@ -145,8 +145,6 @@ int main (
   pwr_tStatus	sts;
   int		event;
   plc_sProcess	*pp;
-  uid_t         ruid;
-  struct passwd *pwd;
 /*
   struct rlimit rlim;
   int i;
@@ -171,6 +169,9 @@ int main (
   /* Once threads has set their priority don't run as root */
   
 #if 0
+  uid_t         ruid;
+  struct passwd *pwd;
+
   ruid = getuid();
   
   if (ruid == 0) {

src/tools/pkg/deb/pwr/control

-Package: pwr46
-Version: 4.6.1-1
+Package: pwr47
+Version: 4.7.0-1
 Section: base
 Priority: optional
 Architecture: i386
 Depends: libc6 (>= 2.7-18), libgtk2.0-0 (>= 2.12.12-1~lenny1), libasound2 (>= 1.0.16-2), libdb4.6 (>=4.6.21-11), libdb4.6++ (>= 4.6.21-11), libmysqlclient15off (>= 5.0.51a-24+lenny1), g++ (>= 4:4.3.2-2)
-Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45
+Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package
  Proview development and runtime environment
- 4.6.1-1 Base release 
+ 4.7.0-1 Base release 

src/tools/pkg/deb/pwrdemo/control

-Package: pwrdemo46
-Version: 4.6.1-1
+Package: pwrdemo47
+Version: 4.7.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr46 (>= 4.6.1-1)
+Depends: pwr47 (>= 4.7.0-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project
- 4.6.1-1 Base release 
+ 4.7.0-1 Base release 

src/tools/pkg/deb/pwrrt/control

 Package: pwrrt
-Version: 4.6.1-1
+Version: 4.7.0-1
 Section: base
 Priority: optional
 Architecture: i386
 Depends: libc6 (>= 2.7-18), libgtk2.0-0 (>= 2.12.12-1~lenny1), libasound2 (>= 1.0.16-2), libdb4.6 (>=4.6.21-11)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview runtime environment
- 4.6.1-1 Base release
+ 4.7.0-1 Base release

src/tools/pkg/deb/pwrsev/control

 Package: pwrsev
-Version: 4.6.1-1
+Version: 4.7.0-1
 Section: base
 Priority: optional
 Architecture: i386
 Depends: libc6 (>= 2.7-18), libgtk2.0-0 (>= 2.12.12-1~lenny1), libasound2 (>= 1.0.16-2), libdb4.6 (>=4.6.21-11), libmysqlclient15off (>= 5.0.51a-24+lenny1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46
 Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview storage environment
- 4.6.1-1 Base release
+ 4.7.0-1 Base release