Revision: 9070
http://playerstage.svn.sourceforge.net/playerstage/?rev=9070&view=rev
Author: jpgr87
Date: 2011-08-11 01:26:59 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Applied patch #3389780: MacOSX compatibility patch
Modified Paths:
--------------
code/player/trunk/server/drivers/mixed/rmp/usb_packet.cc
code/player/trunk/server/drivers/shell/guile/reflectioner
Modified: code/player/trunk/server/drivers/mixed/rmp/usb_packet.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/rmp/usb_packet.cc 2011-08-11
01:24:24 UTC (rev 9069)
+++ code/player/trunk/server/drivers/mixed/rmp/usb_packet.cc 2011-08-11
01:26:59 UTC (rev 9070)
@@ -163,9 +163,10 @@
}
cfmakeraw(&term);
+#ifdef B460800
cfsetispeed(&term, B460800);
cfsetospeed(&term, B460800);
-
+#endif
if(tcsetattr(fd, TCSAFLUSH, &term) < 0 ) {
PLAYER_ERROR1("tcsetattr() failed: %s", strerror(errno));
close(fd);
Modified: code/player/trunk/server/drivers/shell/guile/reflectioner
===================================================================
--- code/player/trunk/server/drivers/shell/guile/reflectioner 2011-08-11
01:24:24 UTC (rev 9069)
+++ code/player/trunk/server/drivers/shell/guile/reflectioner 2011-08-11
01:26:59 UTC (rev 9070)
@@ -26,10 +26,9 @@
echo "Invalid def file structure: '{' expected" >&2
exit 1
fi
- echo -n " " >>${outfile}
- if [ ${num} -gt 0 ]; then echo -n "else " >>${outfile}; fi
+ if [ ${num} -gt 0 ]; then echo " else " >>${outfile}; fi
let num=${num}+1
- echo "if (!strcmp(\"${name}\", structure))" >>${outfile}
+ echo " if (!strcmp(\"${name}\", structure))" >>${outfile}
echo " {" >>${outfile}
echo " if (!field)" >>${outfile}
echo " {" >>${outfile}
@@ -240,33 +239,32 @@
tmp="${field}"
field="*${field}"
fi
- echo -n " " >>${outfile}
- if [ ${fields} -gt 0 ]; then echo -n "else " >>${outfile}; fi
+ if [ ${fields} -gt 0 ]; then echo " else " >>${outfile}; fi
let fields=${fields}+1
fieldname=`echo ${field}|cut -f1 -d ';'|cut -f2 -d '*'|cut -f1 -d
'['`
- echo "if (!strcmp(\"${fieldname}\", field))" >>${outfile}
+ echo " if (!strcmp(\"${fieldname}\", field))" >>${outfile}
echo " {" >>${outfile}
if echo "${field}" | grep -e "^\*\*" >/dev/null
then
echo "Unsupported data type: pointer to a pointer" >&2
exit 1
fi
- echo -n " desc->type = " >>${outfile}
+ echo " desc->type = " >>${outfile}
case "${type}" in
- "char") echo "PLAYER_FIELD_CHAR;" >>${outfile};;
- "int") echo "PLAYER_FIELD_INT;" >>${outfile};;
- "short") echo "PLAYER_FIELD_SHORT;" >>${outfile};;
- "int8_t") echo "PLAYER_FIELD_INT8;" >>${outfile};;
- "uint8_t") echo "PLAYER_FIELD_UINT8;" >>${outfile};;
- "int16_t") echo "PLAYER_FIELD_INT16;" >>${outfile};;
- "uint16_t") echo "PLAYER_FIELD_UINT16;" >>${outfile};;
- "int32_t") echo "PLAYER_FIELD_INT32;" >>${outfile};;
- "uint32_t") echo "PLAYER_FIELD_UINT32;" >>${outfile};;
- "int64_t") echo "PLAYER_FIELD_INT64;" >>${outfile};;
- "uint64_t") echo "PLAYER_FIELD_UINT64;" >>${outfile};;
- "float") echo "PLAYER_FIELD_FLOAT;" >>${outfile};;
- "double") echo "PLAYER_FIELD_DOUBLE;" >>${outfile};;
- *) echo "PLAYER_FIELD_COMPOUND;" >>${outfile}
+ "char") echo " PLAYER_FIELD_CHAR;" >>${outfile};;
+ "int") echo " PLAYER_FIELD_INT;" >>${outfile};;
+ "short") echo " PLAYER_FIELD_SHORT;" >>${outfile};;
+ "int8_t") echo " PLAYER_FIELD_INT8;" >>${outfile};;
+ "uint8_t") echo " PLAYER_FIELD_UINT8;" >>${outfile};;
+ "int16_t") echo " PLAYER_FIELD_INT16;" >>${outfile};;
+ "uint16_t") echo " PLAYER_FIELD_UINT16;" >>${outfile};;
+ "int32_t") echo " PLAYER_FIELD_INT32;" >>${outfile};;
+ "uint32_t") echo " PLAYER_FIELD_UINT32;" >>${outfile};;
+ "int64_t") echo " PLAYER_FIELD_INT64;" >>${outfile};;
+ "uint64_t") echo " PLAYER_FIELD_UINT64;" >>${outfile};;
+ "float") echo " PLAYER_FIELD_FLOAT;" >>${outfile};;
+ "double") echo " PLAYER_FIELD_DOUBLE;" >>${outfile};;
+ *) echo " PLAYER_FIELD_COMPOUND;" >>${outfile}
esac
echo " desc->size = sizeof(${type});" >>${outfile}
echo " desc->ptr = reinterpret_cast<void
*>(&((reinterpret_cast<struct ${name} *>(data))->${fieldname}));" >>${outfile}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
