mirror of https://github.com/mpv-player/mpv
Add missing 'void' to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
56a13121a7
commit
d9ded9284c
|
@ -12,16 +12,16 @@ static int init(int rate,int channels,int format,int flags);
|
||||||
Sample format: usually AFMT_S16_LE or AFMT_U8, for more definitions see
|
Sample format: usually AFMT_S16_LE or AFMT_U8, for more definitions see
|
||||||
dec_audio.c and linux/soundcards.h files!
|
dec_audio.c and linux/soundcards.h files!
|
||||||
|
|
||||||
static void uninit();
|
static void uninit(void);
|
||||||
Guess what.
|
Guess what.
|
||||||
Ok I help: closes the device, not (yet) called when exit.
|
Ok I help: closes the device, not (yet) called when exit.
|
||||||
|
|
||||||
static void reset();
|
static void reset(void);
|
||||||
Resets device. To be exact, it's for deleting buffers' contents,
|
Resets device. To be exact, it's for deleting buffers' contents,
|
||||||
so after reset() the previously received stuff won't be output.
|
so after reset() the previously received stuff won't be output.
|
||||||
(called if pause or seek)
|
(called if pause or seek)
|
||||||
|
|
||||||
static int get_space();
|
static int get_space(void);
|
||||||
Returns how many bytes can be written into the audio buffer without
|
Returns how many bytes can be written into the audio buffer without
|
||||||
blocking (making caller process wait). MPlayer occasionally checks the
|
blocking (making caller process wait). MPlayer occasionally checks the
|
||||||
remaining space and tries to fill the buffer with play() if there's free
|
remaining space and tries to fill the buffer with play() if there's free
|
||||||
|
@ -41,7 +41,7 @@ static int play(void* data,int len,int flags);
|
||||||
rounded down to 0 or the data will never be played (as MPlayer will never
|
rounded down to 0 or the data will never be played (as MPlayer will never
|
||||||
call play() with a larger len).
|
call play() with a larger len).
|
||||||
|
|
||||||
static float get_delay();
|
static float get_delay(void);
|
||||||
Returns how long time it will take to play the data currently in the
|
Returns how long time it will take to play the data currently in the
|
||||||
output buffer. Be exact, if possible, since the whole timing depends
|
output buffer. Be exact, if possible, since the whole timing depends
|
||||||
on this! In the worst case, return the maximum delay.
|
on this! In the worst case, return the maximum delay.
|
||||||
|
|
|
@ -140,7 +140,7 @@ char *get_path(const char *filename){
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL)
|
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL)
|
||||||
void set_path_env()
|
void set_path_env(void)
|
||||||
{
|
{
|
||||||
/*make our codec dirs available for LoadLibraryA()*/
|
/*make our codec dirs available for LoadLibraryA()*/
|
||||||
char tmppath[MAX_PATH*2 + 1];
|
char tmppath[MAX_PATH*2 + 1];
|
||||||
|
|
|
@ -22,6 +22,6 @@
|
||||||
#define MPLAYER_GET_PATH_H
|
#define MPLAYER_GET_PATH_H
|
||||||
|
|
||||||
char *get_path(const char *filename);
|
char *get_path(const char *filename);
|
||||||
void set_path_env();
|
void set_path_env(void);
|
||||||
|
|
||||||
#endif /* MPLAYER_GET_PATH_H */
|
#endif /* MPLAYER_GET_PATH_H */
|
||||||
|
|
|
@ -303,7 +303,7 @@ mp_input_ar_init_error:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int is_mplayer_front()
|
int is_mplayer_front(void)
|
||||||
{
|
{
|
||||||
ProcessSerialNumber myProc, frProc;
|
ProcessSerialNumber myProc, frProc;
|
||||||
Boolean sameProc;
|
Boolean sameProc;
|
||||||
|
|
|
@ -43,7 +43,7 @@ void mp_msg( int x, const char *format, ... ) // stub for cpudetect.c
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMING
|
#ifdef TIMING
|
||||||
static inline long long rdtsc()
|
static inline long long rdtsc(void)
|
||||||
{
|
{
|
||||||
long long l;
|
long long l;
|
||||||
__asm__ volatile("rdtsc\n\t"
|
__asm__ volatile("rdtsc\n\t"
|
||||||
|
|
|
@ -215,7 +215,7 @@ static void print_format(int lev, const char* str, const AudioStreamBasicDescrip
|
||||||
|
|
||||||
static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id );
|
static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id );
|
||||||
static int AudioStreamSupportsDigital( AudioStreamID i_stream_id );
|
static int AudioStreamSupportsDigital( AudioStreamID i_stream_id );
|
||||||
static int OpenSPDIF();
|
static int OpenSPDIF(void);
|
||||||
static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format );
|
static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format );
|
||||||
static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
|
static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
|
||||||
const AudioTimeStamp * inNow,
|
const AudioTimeStamp * inNow,
|
||||||
|
@ -473,7 +473,7 @@ err_out:
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Setup a encoded digital stream (SPDIF)
|
* Setup a encoded digital stream (SPDIF)
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
static int OpenSPDIF()
|
static int OpenSPDIF(void)
|
||||||
{
|
{
|
||||||
OSStatus err = noErr;
|
OSStatus err = noErr;
|
||||||
UInt32 i_param_size, b_mix = 0;
|
UInt32 i_param_size, b_mix = 0;
|
||||||
|
|
|
@ -81,7 +81,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR);
|
||||||
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
|
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
|
||||||
int WINAPI FreeLibrary(HMODULE);
|
int WINAPI FreeLibrary(HMODULE);
|
||||||
|
|
||||||
static int loader_init()
|
static int loader_init(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef WIN32_LOADER
|
#ifdef WIN32_LOADER
|
||||||
|
|
|
@ -193,7 +193,7 @@ typedef struct {
|
||||||
//DllPort int TvqInitialize( headerInfo *setupInfo, INDEX *index, int dispErrorMessageBox );
|
//DllPort int TvqInitialize( headerInfo *setupInfo, INDEX *index, int dispErrorMessageBox );
|
||||||
//DllPort void TvqTerminate( INDEX *index );
|
//DllPort void TvqTerminate( INDEX *index );
|
||||||
//DllPort void TvqGetVectorInfo(int *bits0[], int *bits1[]);
|
//DllPort void TvqGetVectorInfo(int *bits0[], int *bits1[]);
|
||||||
//DllPort void TvqResetFrameCounter();
|
//DllPort void TvqResetFrameCounter(void);
|
||||||
|
|
||||||
// TwinVQ decoder function
|
// TwinVQ decoder function
|
||||||
//DllPort void TvqDecodeFrame(INDEX *indexp, float out[]);
|
//DllPort void TvqDecodeFrame(INDEX *indexp, float out[]);
|
||||||
|
@ -205,19 +205,19 @@ typedef struct {
|
||||||
//DllPort int TvqCheckVersion(char *versionID);
|
//DllPort int TvqCheckVersion(char *versionID);
|
||||||
//DllPort void TvqGetSetupInfo(headerInfo *setupInfo); // setup information
|
//DllPort void TvqGetSetupInfo(headerInfo *setupInfo); // setup information
|
||||||
//DllPort void TvqGetConfInfo(tvqConfInfo *cf); // configuration information
|
//DllPort void TvqGetConfInfo(tvqConfInfo *cf); // configuration information
|
||||||
//DllPort int TvqGetFrameSize(); // frame size
|
//DllPort int TvqGetFrameSize(void); // frame size
|
||||||
//DllPort int TvqGetNumChannels(); // number of channels
|
//DllPort int TvqGetNumChannels(void); // number of channels
|
||||||
//DllPort int TvqGetBitRate(); // total bitrate
|
//DllPort int TvqGetBitRate(void); // total bitrate
|
||||||
//DllPort float TvqGetSamplingRate(); // sampling rate
|
//DllPort float TvqGetSamplingRate(void); // sampling rate
|
||||||
//DllPort int TvqGetNumFixedBitsPerFrame(); // number of fixed bits per frame
|
//DllPort int TvqGetNumFixedBitsPerFrame(void); // number of fixed bits per frame
|
||||||
//DllPort int TvqGetNumFrames(); // number of decoded frame
|
//DllPort int TvqGetNumFrames(void); // number of decoded frame
|
||||||
//DllPort int TvqGetModuleVersion( char* versionString );
|
//DllPort int TvqGetModuleVersion( char* versionString );
|
||||||
|
|
||||||
#ifdef V2PLUS_SUPPORT
|
#ifdef V2PLUS_SUPPORT
|
||||||
// TwinVQ FB coding tool control
|
// TwinVQ FB coding tool control
|
||||||
DllPort void TvqFbCountUsedBits(int nbit); // count number of used bits
|
DllPort void TvqFbCountUsedBits(int nbit); // count number of used bits
|
||||||
DllPort float TvqGetFbCurrentBitrate(); // query average bitrate for the tool
|
DllPort float TvqGetFbCurrentBitrate(void); // query average bitrate for the tool
|
||||||
DllPort int TvqGetFbTotalBits(); // query total number of used bits
|
DllPort int TvqGetFbTotalBits(void); // query total number of used bits
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -454,7 +454,7 @@ static int mga_init(int width,int height,unsigned int format){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mga_uninit(){
|
static int mga_uninit(void){
|
||||||
if(f>=0){
|
if(f>=0){
|
||||||
ioctl( f,MGA_VID_OFF,0 );
|
ioctl( f,MGA_VID_OFF,0 );
|
||||||
munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
|
munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
|
||||||
|
|
|
@ -140,7 +140,7 @@ static void osdpercent(int duration, int min, int max, int val, const char *desc
|
||||||
posbar[screen_w] = '\0';
|
posbar[screen_w] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
static int resize ()
|
static int resize(void)
|
||||||
{
|
{
|
||||||
screen_w = caca_get_width();
|
screen_w = caca_get_width();
|
||||||
screen_h = caca_get_height();
|
screen_h = caca_get_height();
|
||||||
|
|
|
@ -200,7 +200,7 @@ query_format(uint32_t format)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t Directx_CreatePrimarySurface()
|
static uint32_t Directx_CreatePrimarySurface(void)
|
||||||
{
|
{
|
||||||
DDSURFACEDESC2 ddsd;
|
DDSURFACEDESC2 ddsd;
|
||||||
//cleanup
|
//cleanup
|
||||||
|
@ -310,7 +310,7 @@ static uint32_t Directx_CreateOverlay(uint32_t imgfmt)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t Directx_CreateBackpuffer()
|
static uint32_t Directx_CreateBackpuffer(void)
|
||||||
{
|
{
|
||||||
DDSURFACEDESC2 ddsd;
|
DDSURFACEDESC2 ddsd;
|
||||||
//cleanup
|
//cleanup
|
||||||
|
@ -416,7 +416,7 @@ static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, L
|
||||||
return 1; // list all adapters
|
return 1; // list all adapters
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t Directx_InitDirectDraw()
|
static uint32_t Directx_InitDirectDraw(void)
|
||||||
{
|
{
|
||||||
HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *,LPVOID *, REFIID,IUnknown FAR *);
|
HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *,LPVOID *, REFIID,IUnknown FAR *);
|
||||||
DDSURFACEDESC2 ddsd;
|
DDSURFACEDESC2 ddsd;
|
||||||
|
@ -533,7 +533,7 @@ static void check_events(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t Directx_ManageDisplay()
|
static uint32_t Directx_ManageDisplay(void)
|
||||||
{
|
{
|
||||||
HRESULT ddrval;
|
HRESULT ddrval;
|
||||||
DDCAPS capsDrv;
|
DDCAPS capsDrv;
|
||||||
|
@ -763,7 +763,7 @@ static uint32_t Directx_ManageDisplay()
|
||||||
}
|
}
|
||||||
|
|
||||||
//find out supported overlay pixelformats
|
//find out supported overlay pixelformats
|
||||||
static uint32_t Directx_CheckOverlayPixelformats()
|
static uint32_t Directx_CheckOverlayPixelformats(void)
|
||||||
{
|
{
|
||||||
DDCAPS capsDrv;
|
DDCAPS capsDrv;
|
||||||
HRESULT ddrval;
|
HRESULT ddrval;
|
||||||
|
@ -824,7 +824,7 @@ static uint32_t Directx_CheckOverlayPixelformats()
|
||||||
}
|
}
|
||||||
|
|
||||||
//find out the Pixelformat of the Primary Surface
|
//find out the Pixelformat of the Primary Surface
|
||||||
static uint32_t Directx_CheckPrimaryPixelformat()
|
static uint32_t Directx_CheckPrimaryPixelformat(void)
|
||||||
{
|
{
|
||||||
uint32_t i=0;
|
uint32_t i=0;
|
||||||
uint32_t formatcount = 0;
|
uint32_t formatcount = 0;
|
||||||
|
|
|
@ -203,7 +203,7 @@ int write_dxr2(const unsigned char *data, int len)
|
||||||
return w;
|
return w;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void flush_dxr2()
|
static void flush_dxr2(void)
|
||||||
{
|
{
|
||||||
int w;
|
int w;
|
||||||
while (dxr2bufpos) {
|
while (dxr2bufpos) {
|
||||||
|
|
|
@ -151,10 +151,10 @@ enum
|
||||||
static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
||||||
static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
||||||
static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
|
||||||
void window_resized();
|
void window_resized(void);
|
||||||
void window_ontop();
|
void window_ontop(void);
|
||||||
void window_fullscreen();
|
void window_fullscreen(void);
|
||||||
void window_panscan();
|
void window_panscan(void);
|
||||||
|
|
||||||
static inline int convert_key(UInt32 key, UInt32 charcode)
|
static inline int convert_key(UInt32 key, UInt32 charcode)
|
||||||
{
|
{
|
||||||
|
@ -1315,7 +1315,7 @@ static int control(uint32_t request, void *data, ...)
|
||||||
return VO_NOTIMPL;
|
return VO_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_resized()
|
void window_resized(void)
|
||||||
{
|
{
|
||||||
float aspectX;
|
float aspectX;
|
||||||
float aspectY;
|
float aspectY;
|
||||||
|
@ -1396,7 +1396,7 @@ void window_resized()
|
||||||
QDEndCGContext(GetWindowPort(theWindow), &context);
|
QDEndCGContext(GetWindowPort(theWindow), &context);
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_ontop()
|
void window_ontop(void)
|
||||||
{
|
{
|
||||||
if (!vo_quartz_fs)
|
if (!vo_quartz_fs)
|
||||||
{
|
{
|
||||||
|
@ -1408,7 +1408,7 @@ void window_ontop()
|
||||||
SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
|
SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_fullscreen()
|
void window_fullscreen(void)
|
||||||
{
|
{
|
||||||
// go fullscreen
|
// go fullscreen
|
||||||
if (vo_fs)
|
if (vo_fs)
|
||||||
|
@ -1493,7 +1493,7 @@ void window_fullscreen()
|
||||||
window_resized();
|
window_resized();
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_panscan()
|
void window_panscan(void)
|
||||||
{
|
{
|
||||||
panscan_calc();
|
panscan_calc();
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ static void uninit(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void clear_screen()
|
static void clear_screen(void)
|
||||||
{
|
{
|
||||||
/* There needs to be some sort of delay here or else things seriously
|
/* There needs to be some sort of delay here or else things seriously
|
||||||
* screw up. Causes the image to not be the right size on screen if
|
* screw up. Causes the image to not be the right size on screen if
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "win32.h" // printf macro
|
#include "win32.h" // printf macro
|
||||||
|
|
||||||
void trapbug();
|
void trapbug(void);
|
||||||
typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
|
typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
|
||||||
|
|
||||||
void DMO_Filter_Destroy(DMO_Filter* This)
|
void DMO_Filter_Destroy(DMO_Filter* This)
|
||||||
|
|
|
@ -30,8 +30,6 @@ HRESULT STDCALL CoInitialize(LPVOID pvReserved);
|
||||||
void STDCALL CoUninitialize(void);
|
void STDCALL CoUninitialize(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//void trapbug();
|
|
||||||
|
|
||||||
static void DS_Filter_Start(DS_Filter* This)
|
static void DS_Filter_Start(DS_Filter* This)
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
|
@ -216,7 +216,7 @@ static reg_handle_t* find_handle(int handle)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
static int generate_handle()
|
static int generate_handle(void)
|
||||||
{
|
{
|
||||||
static unsigned int zz=249;
|
static unsigned int zz=249;
|
||||||
zz++;
|
zz++;
|
||||||
|
|
|
@ -223,7 +223,7 @@ LRESULT VFWAPI ICClose(HIC hic) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int VFWAPI ICDoSomething()
|
int VFWAPI ICDoSomething(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,7 +90,7 @@ static void do_cpuid(unsigned int ax, unsigned int *regs)
|
||||||
: "0" (ax), "S" (regs)
|
: "0" (ax), "S" (regs)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
static unsigned int c_localcount_tsc()
|
static unsigned int c_localcount_tsc(void)
|
||||||
{
|
{
|
||||||
int a;
|
int a;
|
||||||
__asm__ volatile
|
__asm__ volatile
|
||||||
|
@ -116,7 +116,7 @@ static void c_longcount_tsc(long long* z)
|
||||||
:"edx"
|
:"edx"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
static unsigned int c_localcount_notsc()
|
static unsigned int c_localcount_notsc(void)
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
unsigned limit=~0;
|
unsigned limit=~0;
|
||||||
|
@ -485,7 +485,7 @@ static void* my_realloc(void* memory, int size)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int WINAPI ext_unknown()
|
static int WINAPI ext_unknown(void)
|
||||||
{
|
{
|
||||||
printf("Unknown func called\n");
|
printf("Unknown func called\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1134,7 +1134,7 @@ static WIN_BOOL WINAPI expIsProcessorFeaturePresent(DWORD v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static long WINAPI expGetVersion()
|
static long WINAPI expGetVersion(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetVersion() => 0xC0000004\n");
|
dbgprintf("GetVersion() => 0xC0000004\n");
|
||||||
return 0xC0000004;//Windows 95
|
return 0xC0000004;//Windows 95
|
||||||
|
@ -1426,12 +1426,12 @@ static void WINAPI expDeleteCriticalSection(CRITICAL_SECTION *c)
|
||||||
#endif
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
static int WINAPI expGetCurrentThreadId()
|
static int WINAPI expGetCurrentThreadId(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetCurrentThreadId() => %d\n", pthread_self());
|
dbgprintf("GetCurrentThreadId() => %d\n", pthread_self());
|
||||||
return pthread_self();
|
return pthread_self();
|
||||||
}
|
}
|
||||||
static int WINAPI expGetCurrentProcess()
|
static int WINAPI expGetCurrentProcess(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetCurrentProcess() => %d\n", getpid());
|
dbgprintf("GetCurrentProcess() => %d\n", getpid());
|
||||||
return getpid();
|
return getpid();
|
||||||
|
@ -1445,7 +1445,7 @@ extern void* fs_seg;
|
||||||
|
|
||||||
//static int tls_count;
|
//static int tls_count;
|
||||||
static int tls_use_map[64];
|
static int tls_use_map[64];
|
||||||
static int WINAPI expTlsAlloc()
|
static int WINAPI expTlsAlloc(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for(i=0; i<64; i++)
|
for(i=0; i<64; i++)
|
||||||
|
@ -1496,7 +1496,7 @@ struct tls_s {
|
||||||
struct tls_s* next;
|
struct tls_s* next;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void* WINAPI expTlsAlloc()
|
static void* WINAPI expTlsAlloc(void)
|
||||||
{
|
{
|
||||||
if (g_tls == NULL)
|
if (g_tls == NULL)
|
||||||
{
|
{
|
||||||
|
@ -1913,7 +1913,7 @@ static DWORD WINAPI expRegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_l
|
||||||
/*
|
/*
|
||||||
* return CPU clock (in kHz), using linux's /proc filesystem (/proc/cpuinfo)
|
* return CPU clock (in kHz), using linux's /proc filesystem (/proc/cpuinfo)
|
||||||
*/
|
*/
|
||||||
static double linux_cpuinfo_freq()
|
static double linux_cpuinfo_freq(void)
|
||||||
{
|
{
|
||||||
double freq=-1;
|
double freq=-1;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
@ -1945,7 +1945,7 @@ static double linux_cpuinfo_freq()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static double solaris_kstat_freq()
|
static double solaris_kstat_freq(void)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_LIBKSTAT) && defined(KSTAT_DATA_INT32)
|
#if defined(HAVE_LIBKSTAT) && defined(KSTAT_DATA_INT32)
|
||||||
/*
|
/*
|
||||||
|
@ -1988,7 +1988,7 @@ static double solaris_kstat_freq()
|
||||||
/*
|
/*
|
||||||
* Measure CPU freq using the pentium's time stamp counter register (TSC)
|
* Measure CPU freq using the pentium's time stamp counter register (TSC)
|
||||||
*/
|
*/
|
||||||
static double tsc_freq()
|
static double tsc_freq(void)
|
||||||
{
|
{
|
||||||
static double ofreq=0.0;
|
static double ofreq=0.0;
|
||||||
int i;
|
int i;
|
||||||
|
@ -2004,7 +2004,7 @@ static double tsc_freq()
|
||||||
return ofreq;
|
return ofreq;
|
||||||
}
|
}
|
||||||
|
|
||||||
static double CPU_Freq()
|
static double CPU_Freq(void)
|
||||||
{
|
{
|
||||||
double freq;
|
double freq;
|
||||||
|
|
||||||
|
@ -2023,7 +2023,7 @@ static long WINAPI expQueryPerformanceFrequency(long long* z)
|
||||||
dbgprintf("QueryPerformanceFrequency(0x%x) => 1 ( %Ld )\n", z, *z);
|
dbgprintf("QueryPerformanceFrequency(0x%x) => 1 ( %Ld )\n", z, *z);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
static long WINAPI exptimeGetTime()
|
static long WINAPI exptimeGetTime(void)
|
||||||
{
|
{
|
||||||
struct timeval t;
|
struct timeval t;
|
||||||
long result;
|
long result;
|
||||||
|
@ -2116,13 +2116,13 @@ static int WINAPI expCloseHandle(long v1)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char* WINAPI expGetCommandLineA()
|
static const char* WINAPI expGetCommandLineA(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetCommandLineA() => \"c:\\aviplay.exe\"\n");
|
dbgprintf("GetCommandLineA() => \"c:\\aviplay.exe\"\n");
|
||||||
return "c:\\aviplay.exe";
|
return "c:\\aviplay.exe";
|
||||||
}
|
}
|
||||||
static short envs[]={'p', 'a', 't', 'h', ' ', 'c', ':', '\\', 0, 0};
|
static short envs[]={'p', 'a', 't', 'h', ' ', 'c', ':', '\\', 0, 0};
|
||||||
static LPWSTR WINAPI expGetEnvironmentStringsW()
|
static LPWSTR WINAPI expGetEnvironmentStringsW(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetEnvironmentStringsW() => 0\n", envs);
|
dbgprintf("GetEnvironmentStringsW() => 0\n", envs);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2160,7 +2160,7 @@ static int WINAPI expFreeEnvironmentStringsA(char* strings)
|
||||||
static const char ch_envs[]=
|
static const char ch_envs[]=
|
||||||
"__MSVCRT_HEAP_SELECT=__GLOBAL_HEAP_SELECTED,1\r\n"
|
"__MSVCRT_HEAP_SELECT=__GLOBAL_HEAP_SELECTED,1\r\n"
|
||||||
"PATH=C:\\;C:\\windows\\;C:\\windows\\system\r\n";
|
"PATH=C:\\;C:\\windows\\;C:\\windows\\system\r\n";
|
||||||
static LPCSTR WINAPI expGetEnvironmentStrings()
|
static LPCSTR WINAPI expGetEnvironmentStrings(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetEnvironmentStrings() => 0x%x\n", ch_envs);
|
dbgprintf("GetEnvironmentStrings() => 0x%x\n", ch_envs);
|
||||||
return (LPCSTR)ch_envs;
|
return (LPCSTR)ch_envs;
|
||||||
|
@ -2818,7 +2818,7 @@ static int WINAPI expSizeofResource(int v1, int v2)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int WINAPI expGetLastError()
|
static int WINAPI expGetLastError(void)
|
||||||
{
|
{
|
||||||
int result=GetLastError();
|
int result=GetLastError();
|
||||||
dbgprintf("GetLastError() => 0x%x\n", result);
|
dbgprintf("GetLastError() => 0x%x\n", result);
|
||||||
|
@ -2914,7 +2914,7 @@ static int WINAPI expReleaseDC(int hwnd, int hdc)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int WINAPI expGetDesktopWindow()
|
static int WINAPI expGetDesktopWindow(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetDesktopWindow() => 0\n");
|
dbgprintf("GetDesktopWindow() => 0\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3581,7 +3581,7 @@ static UINT WINAPI expGetSystemDirectoryA(
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
static char sysdir[]=".";
|
static char sysdir[]=".";
|
||||||
static LPCSTR WINAPI expGetSystemDirectoryA()
|
static LPCSTR WINAPI expGetSystemDirectoryA(void)
|
||||||
{
|
{
|
||||||
dbgprintf("GetSystemDirectoryA() => 0x%x='%s'\n", sysdir, sysdir);
|
dbgprintf("GetSystemDirectoryA() => 0x%x='%s'\n", sysdir, sysdir);
|
||||||
return sysdir;
|
return sysdir;
|
||||||
|
@ -4039,7 +4039,7 @@ static int exp_initterm_e(INITTERMFUNC *start, INITTERMFUNC *end)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void* exp__dllonexit()
|
static void* exp__dllonexit(void)
|
||||||
{
|
{
|
||||||
// FIXME extract from WINE
|
// FIXME extract from WINE
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -52,19 +52,19 @@ int usec_sleep(int usec_delay)
|
||||||
|
|
||||||
|
|
||||||
/* current time in microseconds */
|
/* current time in microseconds */
|
||||||
unsigned int GetTimer()
|
unsigned int GetTimer(void)
|
||||||
{
|
{
|
||||||
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6);
|
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* current time in milliseconds */
|
/* current time in milliseconds */
|
||||||
unsigned int GetTimerMS()
|
unsigned int GetTimerMS(void)
|
||||||
{
|
{
|
||||||
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3);
|
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* time spent between now and last call in seconds */
|
/* time spent between now and last call in seconds */
|
||||||
float GetRelativeTime()
|
float GetRelativeTime(void)
|
||||||
{
|
{
|
||||||
double last_time = relative_time;
|
double last_time = relative_time;
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ float GetRelativeTime()
|
||||||
}
|
}
|
||||||
|
|
||||||
/* initialize timer, must be called at least once at start */
|
/* initialize timer, must be called at least once at start */
|
||||||
void InitTimer()
|
void InitTimer(void)
|
||||||
{
|
{
|
||||||
struct mach_timebase_info timebase;
|
struct mach_timebase_info timebase;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ extern const char *timer_name;
|
||||||
void InitTimer(void);
|
void InitTimer(void);
|
||||||
unsigned int GetTimer(void);
|
unsigned int GetTimer(void);
|
||||||
unsigned int GetTimerMS(void);
|
unsigned int GetTimerMS(void);
|
||||||
//int uGetTimer();
|
//int uGetTimer(void);
|
||||||
float GetRelativeTime(void);
|
float GetRelativeTime(void);
|
||||||
|
|
||||||
int usec_sleep(int usec_delay);
|
int usec_sleep(int usec_delay);
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
|
|
||||||
extern unsigned char *ioBase;
|
extern unsigned char *ioBase;
|
||||||
|
|
||||||
static __inline__ volatile void eieio()
|
static __inline__ volatile void eieio(void)
|
||||||
{
|
{
|
||||||
__asm__ volatile ("eieio");
|
__asm__ volatile ("eieio");
|
||||||
}
|
}
|
||||||
|
|
|
@ -321,7 +321,7 @@ static __inline__ unsigned int inl(short port)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline__ void intr_disable()
|
static __inline__ void intr_disable(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SVGAHELPER
|
#ifdef CONFIG_SVGAHELPER
|
||||||
if (svgahelper_initialized == 1)
|
if (svgahelper_initialized == 1)
|
||||||
|
@ -330,7 +330,7 @@ static __inline__ void intr_disable()
|
||||||
__asm__ volatile("cli");
|
__asm__ volatile("cli");
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline__ void intr_enable()
|
static __inline__ void intr_enable(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SVGAHELPER
|
#ifdef CONFIG_SVGAHELPER
|
||||||
if (svgahelper_initialized == 1)
|
if (svgahelper_initialized == 1)
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "vidix/dhahelperwin/dhahelper.h"
|
#include "vidix/dhahelperwin/dhahelper.h"
|
||||||
|
|
||||||
static HANDLE hDriver;
|
static HANDLE hDriver;
|
||||||
int IsWinNT();
|
int IsWinNT(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue