Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-25 22:21:16 +01:00
Code Issues Projects Releases Wiki Activity

2017-10-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs that broke the build under Windows.
This commit is contained in:
Fred Gleason
2017-10-19 10:49:02 -04:00
parent 9f1fa7cb00
commit 040b693376
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -16178,3 +16178,5 @@
* Added a 'Show Event Type' filter to rdcatch(1). * Added a 'Show Event Type' filter to rdcatch(1).
2017-10-19 Fred Gleason <fredg@paravelsystems.com> 2017-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'socket error' message from 'RDCatchConnect'. * Removed the 'socket error' message from 'RDCatchConnect'.
2017-10-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs that broke the build under Windows.

2
lib/rdconfig.cpp
View File

@@ -619,10 +619,10 @@ void RDConfig::load()
// //
int sock=-1; int sock=-1;
#ifndef WIN32
if((sock=socket(PF_INET,SOCK_DGRAM,IPPROTO_IP))<0) { if((sock=socket(PF_INET,SOCK_DGRAM,IPPROTO_IP))<0) {
return; return;
} }
#ifndef WIN32
struct ifreq ifr; struct ifreq ifr;
int index=0; int index=0;

5
lib/rdreport.cpp
View File

@@ -684,9 +684,10 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
break; break;
} }
#ifdef WIN32 #ifdef WIN32
*out_path=RDDateDecode(exportPath(RDReport::Windows),startdate); *out_path=RDDateDecode(exportPath(RDReport::Windows),startdate,report_station,
QString post_cmd=RDDateDecode(postExportCommand(RDReport::Windows),startdate,
report_config,serviceName()); report_config,serviceName());
QString post_cmd=RDDateDecode(postExportCommand(RDReport::Windows),startdate,
report_station,report_config,serviceName());
#else #else
*out_path=RDDateDecode(exportPath(RDReport::Linux),startdate,report_station, *out_path=RDDateDecode(exportPath(RDReport::Linux),startdate,report_station,
report_config,serviceName()); report_config,serviceName());

3
rdlogmanager/pick_report_dates.cpp
View File

@@ -197,7 +197,8 @@ void PickReportDates::generateData()
#ifdef WIN32 #ifdef WIN32
QString filename= QString filename=
RDDateDecode(report->exportPath(RDReport::Windows), RDDateDecode(report->exportPath(RDReport::Windows),
edit_startdate_edit->date(),log_config,edit_svcname); edit_startdate_edit->date(),rdstation_conf,log_config,
edit_svcname);
#else #else
QString filename= QString filename=
RDDateDecode(report->exportPath(RDReport::Linux), RDDateDecode(report->exportPath(RDReport::Linux),