Skip to content

P
proview
Commit ad12625f authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Merge branch 'master'

parents 6ebf5071 da186818
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 64 deletions
nmps/exe/rs_nmps_bck/src/link_rule.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_eobjs) \ $(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_eobj)/rt_io_user.o \ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
nmps/exe/rs_nmps_mirror/src/link_rule.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_eobjs) \ $(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_eobj)/rt_io_user.o\ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
nmps/exe/rs_nmps_trans/src/link_rule.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_eobjs) \ $(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o -lpwr_nmps $(pwre_conf_libdir) \
$(pwr_eobj)/rt_io_user.o -lpwr_nmps\ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
sev/lib/sev/src/sev_dbms.cpp
View file @ ad12625f
...@@ -4790,7 +4790,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid, ...@@ -4790,7 +4790,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid,
return 0; return 0;
} }
char query[700]; char query[1300];
char starttimstr[40]; char starttimstr[40];
char endtimstr[40]; char endtimstr[40];
pwr_tTime stime, etime; pwr_tTime stime, etime;
...@@ -5108,7 +5108,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid, ...@@ -5108,7 +5108,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid,
e.eventstatus = strtoul(row[j++], 0, 10); e.eventstatus = strtoul(row[j++], 0, 10);
list.push_back(e); list.push_back(e);
} }
printf("ecnt %d\n", list.size()); printf("ecnt %ld\n", list.size());
mysql_free_result(result); mysql_free_result(result);
*sts = SEV__SUCCESS; *sts = SEV__SUCCESS;
......
src/exe/rt_elog/src/link_rule.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(linkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_objs) \ $(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_obj)/rt_io_user.o \ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
src/exe/rt_elog_dump/src/link_rule.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(linkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_objs) \ $(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_obj)/rt_io_user.o \ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
src/exe/rt_ini/src/link_rule.mk
View file @ ad12625f
...@@ -2,14 +2,12 @@ ifndef link_rule_mk ...@@ -2,14 +2,12 @@ ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
ifeq ($(export_type),exp) ifeq ($(export_type),exp)
link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\ $(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_obj)/rt_io_user.o \ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(explinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
else else
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\ $(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwr_obj)/rt_io_user.o \ $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
endif endif
src/tools/bld/src/link_rule_generic.mk
View file @ ad12625f
ifndef link_rule_mk ifndef link_rule_mk
link_rule_mk := 1 link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \ link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) $(rt_msg_objs) \
$(export_obj) $(objects) $(rt_msg_objs) \ $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
endif endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7