Fixed compilation error of prm documentation.

src/doc/prm/src/os_templ/hw_templ/makefile

@@ -40,8 +40,8 @@ silent :
 $(clean_html) : clean_%.html : %.html
 	@ $(rm) $(rmflags) $(doc_dir)/prm/$*.html
 
-$(doc_dir)/prm/index.html : ../../doxygen.dx
-	@ echo "doxygen documentation $(source) $(target)"
+$(doc_dir)/prm/index.html : ../../doxygen.c
+	@ echo "Generating Programmer documentation: doxygen $(source) $(target)"
 	@ doxygen
 #	@ if [ "`eval which pdflatex`" != "" ]; then \
 #	    ./repl.sh latex/*.tex; \
@@ -55,8 +55,3 @@ $(doc_dir)/prm/index.html : ../../doxygen.dx
 #	    rm -f repl.tmp; \
 #	  fi; \
 #	  rm -r -f latex;
-
-
-
-
-

src/exe/co_convert/src/cnv_readwbl.cpp

@@ -654,7 +654,6 @@ void CnvReadWbl::attribute_init()
   strcpy(attr_elements, "");
   attr_pointer = 0;
   attr_array = 0;
-  attr_rtvirtual = 0;
   attr_elem = 0;
   attr_isclass = 0;
 }
@@ -687,8 +686,6 @@ int CnvReadWbl::attribute_attr(char* name, char* value)
         attr_pointer = 1;
       if (streq(value, "PWR_MASK_ARRAY"))
         attr_array = 1;
-      if (streq(value, "PWR_MASK_RTVIRTUAL"))
-        attr_rtvirtual = 1;
       if (streq(value, "PWR_MASK_CLASS"))
         attr_isclass = 1;
     } else {
@@ -706,8 +703,6 @@ int CnvReadWbl::attribute_attr(char* name, char* value)
         attr_pointer = 1;
       if (flags_value & pwr_mAdef_array)
         attr_array = 1;
-      if (flags_value & pwr_mAdef_rtvirtual)
-        attr_rtvirtual = 1;
       if (flags_value & pwr_mAdef_class)
         attr_isclass = 1;
     }
@@ -805,7 +800,6 @@ void CnvReadWbl::body_init()
   strcpy(body_name, "");
   strcpy(body_structname, "");
   strcpy(body_flags, "");
-  body_rtvirtual = 0;
 }
 
 int CnvReadWbl::body_attr(char* name, char* value)
@@ -819,9 +813,6 @@ int CnvReadWbl::body_attr(char* name, char* value)
       strcat(body_flags, &value[9]);
     else
       strcat(body_flags, value);
-
-    if (streq(value, "pwr_mObjBodyDef_RtVirtual"))
-      body_rtvirtual = 1;
   }
   return 1;
 }

src/exe/co_convert/src/cnv_readwbl.h

@@ -131,7 +131,6 @@ class CnvReadWbl {
   CnvWblTo* wblto;
   FILE* fp;
   cread_eLine linetype;
-  int verbose;
   int state;
   int object_state;
   char source_dir[200];
@@ -143,7 +142,6 @@ class CnvReadWbl {
   char attr_typeref_volume[80];
   int attr_pointer;
   int attr_array;
-  int attr_rtvirtual;
   int attr_isclass;
   char attr_elements[80];
   int attr_elem;
@@ -161,7 +159,6 @@ class CnvReadWbl {
   char body_name[80];
   char body_structname[80];
   char body_flags[200];
-  int body_rtvirtual;
   char graphplcnode_name[80];
   char graphplccon_name[20];
   char typedef_name[80];
@@ -195,15 +192,11 @@ class CnvReadWbl {
   char sobject_name[80];
   char dir[120];
 
-  char ClassDef[80];
   char ObjBodyDef[80];
   char GraphPlcNode[80];
-  char GraphPlcCon[80];
   char Attribute[80];
 
   int read_wbl(char* filename);
-  int read_line(char* line, int maxsize, FILE* file);
-  int remove_spaces(char* in, char* out);
   void attribute_init();
   int attribute_attr(char* name, char* value);
   int attribute_close();

src/exe/co_convert/src/cnv_wbltohtml.h

@@ -75,7 +75,6 @@ class CnvWblToHtml : public CnvWblTo {
   std::ofstream fp_html_group[MAX_GROUPS];
   std::ofstream fp_js_group[MAX_GROUPS];
   char html_first[80];
-  char html_tmp_name[80];
   int html_class_open;
   int html_index_open;
   bool js_all_first;

src/exe/co_convert/src/cnv_xtthelptops.h

@@ -69,7 +69,11 @@ class CnvXtthelpToPs : public CnvXtthelpTo {
 
   Cnv_eXtthelpToType type()
   {
-    return Cnv_eXtthelpToType_Ps;
+    if (ctx->generate_pdf) {
+      return Cnv_eXtthelpToType_Pdf;
+    } else {
+      return Cnv_eXtthelpToType_Ps;
+    }
   }
   void* insert(navh_eItemType item_type, const char* text1, const char* text2,
       const char* text3, const char* link, const char* link_bookmark,