Attachment #29374 for bug #49056

Lines 114-122 Link Here

(-)speech_tools/audio/voxware.cc (+2 lines)
114	{	114	{
115	int fmt;	115	int fmt;
116	int sfmts;	116	int sfmts;
		117	int chans = 1;
117		118
118	ioctl(sbdevice,SNDCTL_DSP_RESET,0);	119	ioctl(sbdevice,SNDCTL_DSP_RESET,0);
119	ioctl(sbdevice,SNDCTL_DSP_SPEED,&samp_rate);	120	ioctl(sbdevice,SNDCTL_DSP_SPEED,&samp_rate);
		121	ioctl(sbdevice,SNDCTL_DSP_CHANNELS,&chans);
120	ioctl(sbdevice,SNDCTL_DSP_GETFMTS,&sfmts);	122	ioctl(sbdevice,SNDCTL_DSP_GETFMTS,&sfmts);
121		123
122	if (sfmts == AFMT_U8)	124	if (sfmts == AFMT_U8)

Lines 126-132 Link Here

(-)speech_tools/base_class/EST_Pathname_unix.cc (-1 / +1 lines)
126	struct stat buf;	126	struct stat buf;
127		127
128	if (check_for_directories &&	128	if (check_for_directories &&
129	stat((EST_String)this->as_directory() + name, &buf)==0 &&	129	stat((EST_String)(this->as_directory() + name), &buf)==0 &&
130	(buf.st_mode & S_IFDIR))	130	(buf.st_mode & S_IFDIR))
131	list.append(name.as_directory());	131	list.append(name.as_directory());
132	else	132	else

Lines 41-46 Link Here

(-)speech_tools/base_class/EST_TBuffer.cc (+1 lines)
41		41
42	#include <stdlib.h>	42	#include <stdlib.h>
43	#include <stdio.h>	43	#include <stdio.h>
		44	#include <string.h>
44	#include "EST_unix.h"	45	#include "EST_unix.h"
45	#include "EST_TBuffer.h"	46	#include "EST_TBuffer.h"
46		47

Lines 190-196 Link Here

(-)speech_tools/include/ling_class/EST_Relation.h (-1 / +1 lines)
190	EST_Item prepend(EST_Item si);	190	EST_Item prepend(EST_Item si);
191	EST_Item *prepend();	191	EST_Item *prepend();
192		192
193	friend EST_Item;	193	friend class EST_Item;
194	};	194	};
195		195
196	VAL_REGISTER_CLASS_DCLS(relation,EST_Relation)	196	VAL_REGISTER_CLASS_DCLS(relation,EST_Relation)

Lines 201-208 Link Here

(-)speech_tools/include/rxp/dtd.h (-2 / +2 lines)
201	XML_API Entity DefineEntity(Dtd dtd, Entity entity, int pe);	201	XML_API Entity DefineEntity(Dtd dtd, Entity entity, int pe);
202	XML_API Entity FindEntityN(Dtd dtd, const Char *name, int namelen, int pe);	202	XML_API Entity FindEntityN(Dtd dtd, const Char *name, int namelen, int pe);
203		203
204	#define NewExternalEntity(name, pub, sys, not, parent) \	204	#define NewExternalEntity(name, pub, sys, neg, parent) \
205	NewExternalEntityN(name, name ? Strlen(name) : 0, pub, sys, not, parent)	205	NewExternalEntityN(name, name ? Strlen(name) : 0, pub, sys, neg, parent)
206	#define NewInternalEntity(name, test, parent, l, l1, mat) \	206	#define NewInternalEntity(name, test, parent, l, l1, mat) \
207	NewInternalEntityN(name, name ? Strlen(name) : 0, test, parent, l, l1, mat)	207	NewInternalEntityN(name, name ? Strlen(name) : 0, test, parent, l, l1, mat)
208	#define FindEntity(dtd, name, pe) FindEntityN(dtd, name, Strlen(name), pe)	208	#define FindEntity(dtd, name, pe) FindEntityN(dtd, name, Strlen(name), pe)

Lines 160-170 Link Here

(-)speech_tools/testsuite/named_enum_example.cc (-2 / +2 lines)
160	cout << nm << " is " << (int)c	160	cout << nm << " is " << (int)c
161	<< " = " << ColourMap.name(c)	161	<< " = " << ColourMap.name(c)
162	<< " (" << (spanish?spanish:"[NULL]") << " in Spanish)"	162	<< " (" << (spanish?spanish:"[NULL]") << " in Spanish)"
163	<< " = {" << hex	163	<< " = {"
164	<< info.red << ", "	164	<< info.red << ", "
165	<< info.green << ", "	165	<< info.green << ", "
166	<< info.blue	166	<< info.blue
167	<< dec << "}\n";	167	<< "}\n";
168	}	168	}
169		169
170	// In the special case of EST_TNamedEnum (i.e. simple mappings from	170	// In the special case of EST_TNamedEnum (i.e. simple mappings from

Return to bug 49056