Commit cbc86745 authored by Michael Smith's avatar Michael Smith

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.
parent 8af2be1a
2008-07-23 Michael Smith <msmith@songbirdnest.com>
* 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.
2008-07-22 Stefan Kost <ensonic@users.sf.net>
* ext/timidity/gsttimidity.c:
......
......@@ -84,7 +84,11 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <ctype.h>
#include <string.h>
#include <sys/types.h>
......
......@@ -869,7 +869,8 @@ BOOL CSoundFile::SaveIT(LPCSTR lpszFileName, UINT nPacking)
{
MODCOMMAND *pzc = Patterns[npat];
UINT nz = PatternSize[npat] * m_nChannels;
for (UINT iz=0; iz<nz; iz++)
INT iz;
for (iz=0; iz<nz; iz++)
{
if ((pzc[iz].note) || (pzc[iz].instr)
|| (pzc[iz].volcmd) || (pzc[iz].command)) break;
......
......@@ -820,7 +820,7 @@ UINT CSoundFile::PackSample(int &sample, int next)
}
BOOL CSoundFile::CanPackSample(LPSTR pSample, UINT nLen, UINT nPacking, BYTE *result)
BOOL CSoundFile::CanPackSample(signed char * pSample, UINT nLen, UINT nPacking, BYTE *result)
//-----------------------------------------------------------------------------------
{
int pos, old, oldpos, besttable = 0;
......
......@@ -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);
......
......@@ -10,7 +10,7 @@
#define _STDAFX_H_
#ifdef MSC_VER
#ifdef _MSC_VER
#pragma warning (disable:4201)
#pragma warning (disable:4514)
......
......@@ -47,7 +47,10 @@
#include "config.h"
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment