From cbc867455fc84c1d7abc3f1b5924c1bb17140f9e Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 24 Jul 2008 00:32:37 +0000 Subject: gst/festival/gstfestival.c: Guard unistd.h with HAVE_UNISTD_H Original commit message from CVS: * gst/festival/gstfestival.c: Guard unistd.h with HAVE_UNISTD_H * gst/modplug/libmodplug/load_it.cpp: * gst/modplug/libmodplug/sndfile.cpp: * gst/modplug/libmodplug/sndfile.h: * gst/modplug/libmodplug/stdafx.h: Support for compiling with MSVC: use _MSC_VER for detecting MSVC instead of MSC_VER. Make CanPackSamples take the type it's passed. Change scope of a variable in load_it.cpp to MSVC's scoping rules. * gst/sdp/gstsdpdemux.c: Guard unistd.h with HAVE_UNISTD_H Fixes #544457. --- gst/modplug/libmodplug/sndfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gst/modplug/libmodplug/sndfile.h') diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h index 577bc696..863d866f 100644 --- a/gst/modplug/libmodplug/sndfile.h +++ b/gst/modplug/libmodplug/sndfile.h @@ -730,7 +730,7 @@ public: /* Read/Write sample functions */ signed char GetDeltaValue(signed char prev, UINT n) const { return (signed char)(prev + CompressionTable[n & 0x0F]); } UINT PackSample(int &sample, int next); - BOOL CanPackSample(LPSTR pSample, UINT nLen, UINT nPacking, BYTE *result=NULL); + BOOL CanPackSample(signed char * pSample, UINT nLen, UINT nPacking, BYTE *result=NULL); UINT ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR pMemFile, DWORD dwMemLength); BOOL DestroySample(UINT nSample); BOOL DestroyInstrument(UINT nInstr); -- cgit v1.2.1