rpms
/
libkni3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
libkni3/kni-3.9.2-gcc43.patch

204 lines
8.0 KiB
Diff
Raw Permalink Blame History

diff -urN KNI_3.9.2/demo/keycontrol/keycontrol.cpp KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp
--- KNI_3.9.2/demo/keycontrol/keycontrol.cpp 2007-08-10 14:37:42.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/keycontrol/keycontrol.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <vector>
#include <fstream>
#include <pthread.h>
+#include <cstdlib>
#ifdef WIN32
diff -urN KNI_3.9.2/demo/perfo/main.cpp KNI_3.9.2.gcc43/demo/perfo/main.cpp
--- KNI_3.9.2/demo/perfo/main.cpp 2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/main.cpp 2009-06-12 16:48:21.000000000 +0200
@@ -19,6 +19,7 @@
#include "KNI/kmlBase.h" //for robot: CKatBase, CMotBase, CSctBase
#include "KNI/kmlExt.h" // extended katana features
#include <iostream> //for messages: printf()
+#include <cstdio>
/**********************************************************************************/
#include "perfo.h" //for performance checking..
diff -urN KNI_3.9.2/demo/perfo/perfo.cpp KNI_3.9.2.gcc43/demo/perfo/perfo.cpp
--- KNI_3.9.2/demo/perfo/perfo.cpp 2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/perfo/perfo.cpp 2009-06-12 16:48:29.000000000 +0200
@@ -2,6 +2,7 @@
#include "perfo.h"
#include <time.h>
#include <iostream>
+#include <cstdio>
#include "KNI/cdlCOMExceptions.h"
#include "KNI/cplSerial.h"
@@ -13,7 +14,7 @@
#define CLOCK() (clock_t)((double)(1000.0f * clock()) / CLOCKS_PER_SEC)
//-------------------------------------------------------------------------------//
-void statKatRecv(char strTitle[], long i, long j, clock_t t, long l) {
+void statKatRecv(const char strTitle[], long i, long j, clock_t t, long l) {
printf("-------------------------------------------\n");
printf(strTitle); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
printf("-------------------------------------------\n");
@@ -102,7 +103,7 @@
//-------------------------------------------------------------------------------//
//-------------------------------------------------------------------------------//
-void statMotRecv(char strTitle[], short idx, long i, long j, clock_t t, long l) {
+void statMotRecv(const char strTitle[], short idx, long i, long j, clock_t t, long l) {
printf("-------------------------------------------\n");
printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
printf("-------------------------------------------\n");
@@ -111,7 +112,7 @@
printf("-------------------------------------------\n\n");
}
-void statMotSend(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statMotSend(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
printf("-------------------------------------------\n");
printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
printf("-------------------------------------------\n");
@@ -278,7 +279,7 @@
//-------------------------------------------------------------------------------//
//-------------------------------------------------------------------------------//
-void statSct(char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
+void statSct(const char strTitle[], short idx, long i, long j, long k, long s, clock_t t, long l) {
printf("-------------------------------------------\n");
printf(strTitle, idx); printf("\tAverage: %.3f [ms]\n", (double)t/(double)l);
printf("-------------------------------------------\n");
diff -urN KNI_3.9.2/demo/positions/main.cpp KNI_3.9.2.gcc43/demo/positions/main.cpp
--- KNI_3.9.2/demo/positions/main.cpp 2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/positions/main.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -8,6 +8,7 @@
#include <vector>
#include <fstream>
#include <pthread.h>
+#include <cstdlib>
#ifdef WIN32
diff -urN KNI_3.9.2/demo/sensor/main.cpp KNI_3.9.2.gcc43/demo/sensor/main.cpp
--- KNI_3.9.2/demo/sensor/main.cpp 2007-04-26 08:18:24.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/sensor/main.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
#include <conio.h> //ONLY WIN32 COMPATIBLE!!
#endif
#include <time.h>
+#include <cstdlib>
//------------------------------------------------------------------------//
diff -urN KNI_3.9.2/demo/socketcommands/socketcommands.cpp KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp
--- KNI_3.9.2/demo/socketcommands/socketcommands.cpp 2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcommands/socketcommands.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -6,6 +6,7 @@
#include <iostream>
#include <cstdio>
#include <memory>
+#include <cstdlib>
#ifdef WIN32
diff -urN KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp
--- KNI_3.9.2/demo/socketcontrol/socketcontrol.cpp 2007-09-03 16:04:48.000000000 +0200
+++ KNI_3.9.2.gcc43/demo/socketcontrol/socketcontrol.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -11,6 +11,7 @@
#include <vector>
#include <fstream>
#include <pthread.h>
+#include <cstdlib>
#ifdef WIN32
diff -urN KNI_3.9.2/include/KNI/kmlMotBase.h KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h
--- KNI_3.9.2/include/KNI/kmlMotBase.h 2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/include/KNI/kmlMotBase.h 2009-06-12 16:48:02.000000000 +0200
@@ -45,7 +45,7 @@
/*! \brief command flags
*/
-typedef enum TMotCmdFlg {
+enum TMotCmdFlg {
MCF_OFF = 0, //!< set the motor off
MCF_CALIB = 4, //!< calibrate
MCF_FREEZE = 8, //!< freeze the motor
@@ -54,7 +54,7 @@
/*! \brief status flags
*/
-typedef enum TMotStsFlg {
+enum TMotStsFlg {
MSF_MECHSTOP = 1, //!< mechanical stopper reached
MSF_MAXPOS = 2, //!< max. position was reached
MSF_MINPOS = 4, //!< min. position was reached
diff -urN KNI_3.9.2/src/Base/cdlCOM.cpp KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp
--- KNI_3.9.2/src/Base/cdlCOM.cpp 2007-04-12 14:52:06.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/cdlCOM.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
#include "KNI/cdlCOM.h"
#include "common/Timer.h"
+#include <cstring>
#ifdef WIN32
diff -urN KNI_3.9.2/src/Base/cdlSocket.cpp KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp
--- KNI_3.9.2/src/Base/cdlSocket.cpp 2007-11-06 14:45:08.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cdlSocket.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,9 @@
/****************************************************************************/
#include "KNI/cdlSocket.h"
#include <iostream>
+#include <cstring>
+#include <cstdlib>
+
/****************************************************************************/
//test write:
int writesz;
diff -urN KNI_3.9.2/src/Base/cplSerial.cpp KNI_3.9.2.gcc43/src/Base/cplSerial.cpp
--- KNI_3.9.2/src/Base/cplSerial.cpp 2007-11-13 10:38:44.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/cplSerial.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -22,6 +22,7 @@
#include "KNI/CRC.h"
#include <assert.h>
#include <iostream>
+#include <cstring>
/*
diff -urN KNI_3.9.2/src/Base/kmlBase.cpp KNI_3.9.2.gcc43/src/Base/kmlBase.cpp
--- KNI_3.9.2/src/Base/kmlBase.cpp 2007-11-07 09:22:52.000000000 +0100
+++ KNI_3.9.2.gcc43/src/Base/kmlBase.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -21,6 +21,7 @@
#include "KNI/kmlBase.h"
#include <vector>
+#include <cstring>
bool CKatBase::init(
const TKatGNL _gnl,
diff -urN KNI_3.9.2/src/Base/kmlFactories.cpp KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp
--- KNI_3.9.2/src/Base/kmlFactories.cpp 2007-07-16 14:17:40.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlFactories.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -1,5 +1,7 @@
#include "KNI/kmlFactories.h"
+#include <cstring>
+#include <cstdlib>
namespace KNI {
diff -urN KNI_3.9.2/src/Base/kmlMotBase.cpp KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp
--- KNI_3.9.2/src/Base/kmlMotBase.cpp 2007-09-19 15:16:44.000000000 +0200
+++ KNI_3.9.2.gcc43/src/Base/kmlMotBase.cpp 2009-06-12 16:48:02.000000000 +0200
@@ -15,6 +15,8 @@
#include "common/MathHelperFunctions.h"
#include "common/Timer.h"
#include <iostream>
+#include <cstring>
+#include <cstdlib>
bool CMotBase::init(CKatBase* _own, const TMotDesc _motDesc, CCplBase* _protocol) {
Reference in New Issue View Git Blame Copy Permalink