Motif and cow built on x86_64

profibus/lib/cow/motif/cow_pb_gsd_attr_motif.cpp

@@ -342,7 +342,7 @@ GsdAttrMotif::GsdAttrMotif( Widget a_parent_wid,
   reglist[0].value = (caddr_t) this;
 
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

src/lib/co/src/co_dcli_dir.c

@@ -221,8 +221,8 @@ int dcli_search_file( 		const char *name ,
 	    wildcard = 1;
 	  else
 	    wildcard = 0;
-          if ( wildcard)
-	    dcli_toupper( pattern, pattern);
+          // if ( wildcard)
+	  //   dcli_toupper( pattern, pattern);
 	}
 
 	if ( new == DCLI_DIR_SEARCH_INIT || new == DCLI_DIR_SEARCH_NEXT)

src/lib/rt/src/rt_qcom.h

@@ -98,7 +98,7 @@ typedef enum {
   qcom_eBtype_system,
   qcom_eBtype_qcom,
   qcom_eBtype_event,
-  qcom_eBtype_
+  qcom_eBtype_ = 200
 } qcom_eBtype;
 
 typedef enum {
@@ -109,7 +109,7 @@ typedef enum {
   qcom_eStype_linkStalled,
   qcom_eStype_applConnect,
   qcom_eStype_applDisconnect,
-  qcom_eStype_
+  qcom_eStype_ = 32
 } qcom_eStype;
 
 typedef enum {

src/tools/bld/src/os_linux/mmi_generic.mk

@@ -86,7 +86,7 @@ export_png := $(addprefix $(exe_dir)/, $(png_sources))
 
 $(exe_dir)/%.uid : %.uil
 	@ $(log_uil_uid)
-	@ export -n LANG; uil -o $(target) $(source)
+	@ export LANG; uil -o $(target) $(source)
 
 clean_uid := $(patsubst %.uil,clean_%.uid,$(uil_sources))
 clean_c_pwg := $(patsubst %.pwg,clean_%.pwg,$(pwg_c_sources))

src/wbl/pwrb/src/pwrb_c_dstrend.wb_load

@@ -142,7 +142,7 @@ SObject pwrb:Class
       !*/
       Object DataType $Attribute 5 
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$UInt8"
+          Attr TypeRef = "pwrs:Type-$UInt32"
           Attr Flags |= PWR_MASK_STATE
           Attr Flags |= PWR_MASK_INVISIBLE
         EndBody

wb/exp/com/src/os_linux/wb_gcg.sh

@@ -269,8 +269,6 @@ vFileType="Process,Program,Window,RtNode,Library"
 
 local_setup="pwr_gcg_setup.sh"
 
-echo "OpSys $OsMask" 
-
 if [ -e ${local_setup} ]; then
 #  echo "-- Local setup file used"
   source ${local_setup} ${ProjectRoot} ${SystemName}

wb/lib/wb/motif/wb_foe_motif.cpp

@@ -1165,7 +1165,7 @@ pwr_tStatus WFoeMotif::create_window( int x_top,
    */
 
   /* Save the context structure in the widget */
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   /*
    * Create a new main widget
@@ -1222,7 +1222,7 @@ pwr_tStatus WFoeMotif::create_window( int x_top,
 
   XtSetValues( parent_wid, args, i);
 
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   /* now that we have a top level we can get the main window */
   sts = MrmFetchWidgetOverride(s_MrmH, (char*) "foe_window", parent_wid ,

wb/lib/wb/motif/wb_uted_motif.cpp

@@ -656,7 +656,7 @@ WUtedMotif::WUtedMotif( void	       	*wu_parent_ctx,
   /* set initialization values in context */
 
   /* Save the context structure in the widget */
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   /*
    * Create a new widget

wb/lib/wb/motif/wb_vsel_motif.cpp

@@ -362,7 +362,7 @@ WVselMotif::WVselMotif (
   // set initialization values in context */
 
   // Save the context structure in the widget */
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   /*
    * Create a new widget

wb/lib/wb/motif/wb_watt_motif.cpp

@@ -479,7 +479,7 @@ WAttMotif::WAttMotif(
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

wb/lib/wb/motif/wb_wda_motif.cpp

@@ -587,7 +587,7 @@ WdaMotif::WdaMotif(
   reglist[0].value = (caddr_t) this;
 
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

wb/lib/wb/motif/wb_wge_motif.cpp

@@ -355,7 +355,7 @@ WGeMotif::WGeMotif( Widget wge_parent_wid, void *wge_parent_ctx, char *wge_name,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i],XmNdeleteResponse, XmDO_NOTHING);i++;
 
   toplevel = XtCreatePopupShell( title, 

wb/lib/wb/motif/wb_wpkg_motif.cpp

@@ -245,7 +245,7 @@ WPkgMotif::WPkgMotif(
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

wb/lib/wb/motif/wb_wtt_motif.cpp

@@ -2171,7 +2171,7 @@ WttMotif::WttMotif(
  
   // Save the context structure in the widget
   i = 0;
-  XtSetArg( args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg( args[i], XmNuserData, (XtPointer) this);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/exe/pwr_rtmon/src/os_linux/hw_x86_64/makefile

 include $(pwre_dir_symbols)
 
--include $(pwre_sroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
 
 ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_sroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
 endif
 
 ifeq ($($(type_name)_generic_mk),)
- include $(pwre_sroot)/tools/bld/src/$(type_name)_generic.mk
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
 endif
 
 -include ../../special.mk

xtt/exe/rt_xtt/motif/rt_xtt_motif.cpp

@@ -619,7 +619,7 @@ XttMotif::XttMotif( int argc, char *argv[], int *return_sts) :
  
   // Save the context structure in the widget
   i = 0;
-  XtSetArg( args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg( args[i], XmNuserData, (XtPointer) this);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/cow/motif/cow_login_motif.cpp

@@ -199,7 +199,7 @@ CoLoginMotif::CoLoginMotif( void		*wl_parent_ctx,
  */
 
   /* Save the context structure in the widget */
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   /*
    * Create a new widget

xtt/lib/cow/motif/cow_msgwindow_motif.cpp

@@ -94,7 +94,7 @@ MsgWindowMotif::MsgWindowMotif(
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   dcli_translate_filename( uid_filename, uid_filename);

xtt/lib/cow/motif/cow_xhelp_motif.cpp

@@ -282,7 +282,7 @@ CoXHelpMotif::CoXHelpMotif(
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/ge/motif/ge_attr_motif.cpp

@@ -421,7 +421,7 @@ AttrMotif::AttrMotif( Widget a_parent_wid,
   reglist[0].value = (caddr_t) this;
 
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/ge/motif/ge_curve_motif.cpp

@@ -287,7 +287,7 @@ GeCurveMotif::GeCurveMotif( void 	*gc_parent_ctx,
 		topLevelShellWidgetClass, parent_widget, args, 0);
 
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/ge/motif/ge_motif.cpp

@@ -1513,7 +1513,7 @@ GeMotif::GeMotif( 	void 	*x_parent_ctx,
 						actions, XtNumber(actions));
  
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/ge/motif/ge_subgraphs_motif.cpp

@@ -147,7 +147,7 @@ SubGraphsMotif::SubGraphsMotif(
   strcpy( title, "Loaded SubGraphs");
 
   // Save the context structure in the widget
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/xtt/motif/xtt_block_motif.cpp

@@ -206,7 +206,7 @@ BlockMotif::BlockMotif( void *b_parent_ctx,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   msts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_clog_motif.cpp

@@ -106,7 +106,7 @@ CLogMotif::CLogMotif( void *clog_parent_ctx,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_ev_motif.cpp

@@ -171,7 +171,7 @@ EvMotif::EvMotif( void *ev_parent_ctx,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_ge_motif.cpp

@@ -360,7 +360,7 @@ XttGeMotif::XttGeMotif( Widget xg_parent_wid, void *xg_parent_ctx, const char *x
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i],XmNdeleteResponse, XmDO_NOTHING);i++;
 
   toplevel = XtCreatePopupShell( title, 

xtt/lib/xtt/motif/xtt_hist_motif.cpp

@@ -176,7 +176,7 @@ HistMotif::HistMotif( void *hist_parent_ctx,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_op_motif.cpp

@@ -121,7 +121,7 @@ OpMotif::OpMotif( void *op_parent_ctx,
   func =  MWM_FUNC_ALL | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE;
 
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg(args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
   XtSetArg(args[i],XmNmwmDecorations, decor);i++;
   XtSetArg(args[i],XmNmwmFunctions, func);i++;
@@ -143,7 +143,7 @@ OpMotif::OpMotif( void *op_parent_ctx,
 		topLevelShellWidgetClass, parent_wid, args, i);
 
   i = 0;
-  XtSetArg(args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg(args[i], XmNuserData, (XtPointer) this);i++;
 
   sts = MrmFetchWidgetOverride( s_DRMh, (char*) "op_window", parent_wid_op,
 			name, args, i, &toplevel, &dclass);

xtt/lib/xtt/motif/xtt_trace_motif.cpp

@@ -339,7 +339,7 @@ RtTraceMotif::RtTraceMotif( void *tr_parent_ctx, Widget tr_parent_wid, pwr_tObji
 		topLevelShellWidgetClass, parent_wid, args, 0);
 
   /* Save the context structure in the widget */
-  XtSetArg (args[0], XmNuserData, (unsigned int) this);
+  XtSetArg (args[0], XmNuserData, (XtPointer) this);
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);
   if (sts != MrmSUCCESS) printf("can't open %s\n", uid_filename);

xtt/lib/xtt/motif/xtt_xatt_motif.cpp

@@ -478,7 +478,7 @@ XAttMotif::XAttMotif( Widget 		xa_parent_wid,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_xattone_motif.cpp

@@ -428,7 +428,7 @@ XAttOneMotif::XAttOneMotif( Widget xa_parent_wid,
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/motif/xtt_xcrr_motif.cpp

@@ -175,7 +175,7 @@ XCrrMotif::XCrrMotif(
 
   // Save the context structure in the widget
   i = 0;
-  XtSetArg (args[i], XmNuserData, (unsigned int) this);i++;
+  XtSetArg (args[i], XmNuserData, (XtPointer) this);i++;
   XtSetArg( args[i], XmNdeleteResponse, XmDO_NOTHING);i++;
 
   sts = MrmOpenHierarchy( 1, &uid_filename_p, NULL, &s_DRMh);

xtt/lib/xtt/src/xtt_evlist.cpp

@@ -1361,7 +1361,7 @@ void ItemAlarm::update_text()
     time_str[17] = 0;
   brow_SetAnnotation( node, 1, time_str, strlen(time_str));
 
-  switch ( type)
+  switch ( event_type)
   {
     case evlist_eEventType_Info:
     case evlist_eEventType_Alarm:

xtt/mmi/xtt/motif/os_linux/hw_x86_64/special.mk

@@ -45,15 +45,15 @@ clean_uid := $(patsubst %.uil,clean_%.uid,$(uil_sources))
 
 $(exe_dir)/en_us/%.uid : %.uil
 	@ $(log_uil_uid) en_us
-	@ export -n LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/en_us $(source)
+	@ export LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/en_us $(source)
 
 $(exe_dir)/sv_se/%.uid : %.uil
 	@ $(log_uil_uid) sv_se
-	@ export -n LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/sv_se $(source)
+	@ export LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/sv_se $(source)
 
 $(exe_dir)/de_de/%.uid : %.uil
 	@ $(log_uil_uid) de_de
-	@ export -n LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/de_de $(source)
+	@ export LANG; uil -o $(target) -I$(pwre_sroot)/$(type_name)/$(comp_name)/de_de $(source)
 
 .PHONY : all init copy lib exe clean realclean