ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Portability fixes for LSB compatibility.

This commit is contained in:
Alexandre Julliard 2004-03-01 21:32:02 +00:00
parent 93e268efbd
commit e8a339c1d2
13 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -15819,6 +15819,7 @@ done
for ac_header in \ for ac_header in \
@ -15839,6 +15840,7 @@ for ac_header in \
linux/cdrom.h \ linux/cdrom.h \
linux/hdreg.h \ linux/hdreg.h \
linux/input.h \ linux/input.h \
linux/ioctl.h \
linux/joystick.h \ linux/joystick.h \
linux/major.h \ linux/major.h \
linux/param.h \ linux/param.h \

1
configure.ac
View File

@ -1078,6 +1078,7 @@ AC_CHECK_HEADERS(\
linux/cdrom.h \ linux/cdrom.h \
linux/hdreg.h \ linux/hdreg.h \
linux/input.h \ linux/input.h \
linux/ioctl.h \
linux/joystick.h \ linux/joystick.h \
linux/major.h \ linux/major.h \
linux/param.h \ linux/param.h \

8
dlls/d3d8/shader.c
View File

@ -146,7 +146,7 @@ void vshader_lit(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
void vshader_logp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_logp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE; d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE_VAL;
VSTRACE(("executing logp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing logp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
@ -201,14 +201,14 @@ void vshader_nop(void) {
} }
void vshader_rcp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_rcp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = d->y = d->z = d->w = (0.0f == s0->w) ? HUGE : 1.0f / s0->w; d->x = d->y = d->z = d->w = (0.0f == s0->w) ? HUGE_VAL : 1.0f / s0->w;
VSTRACE(("executing rcp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing rcp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
void vshader_rsq(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_rsq(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f == tmp_f) ? HUGE : ((1.0f != tmp_f) ? 1.0f / sqrtf(tmp_f) : 1.0f); d->x = d->y = d->z = d->w = (0.0f == tmp_f) ? HUGE_VAL : ((1.0f != tmp_f) ? 1.0f / sqrtf(tmp_f) : 1.0f);
VSTRACE(("executing rsq: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing rsq: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
@ -252,7 +252,7 @@ void vshader_exp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
void vshader_log(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_log(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE; d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE_VAL;
VSTRACE(("executing log: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing log: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }

3
dlls/dinput/joystick_linux.c
View File

@ -42,6 +42,9 @@
#ifdef HAVE_SYS_ERRNO_H #ifdef HAVE_SYS_ERRNO_H
# include <sys/errno.h> # include <sys/errno.h>
#endif #endif
#ifdef HAVE_LINUX_IOCTL_H
# include <linux/ioctl.h>
#endif
#ifdef HAVE_LINUX_JOYSTICK_H #ifdef HAVE_LINUX_JOYSTICK_H
# include <linux/joystick.h> # include <linux/joystick.h>
#endif #endif

44
dlls/iphlpapi/ipstats.c
View File

@ -53,38 +53,18 @@
#include "ifenum.h" #include "ifenum.h"
#include "ipstats.h" #include "ipstats.h"
#ifndef TCPS_ESTABLISHED #ifdef linux
# define TCPS_ESTABLISHED TCP_ESTABLISHED #define TCPS_ESTABLISHED 1
#endif #define TCPS_SYN_SENT 2
#ifndef TCPS_SYN_SENT #define TCPS_SYN_RECEIVED 3
# define TCPS_SYN_SENT TCP_SYN_SENT #define TCPS_FIN_WAIT_1 4
#endif #define TCPS_FIN_WAIT_2 5
#ifndef TCPS_SYN_RECEIVED #define TCPS_TIME_WAIT 6
# define TCPS_SYN_RECEIVED TCP_SYN_RECV #define TCPS_CLOSED 7
#endif #define TCPS_CLOSE_WAIT 8
#ifndef TCPS_FIN_WAIT_1 #define TCPS_LAST_ACK 9
# define TCPS_FIN_WAIT_1 TCP_FIN_WAIT1 #define TCPS_LISTEN 10
#endif #define TCPS_CLOSING 11
#ifndef TCPS_FIN_WAIT_2
# define TCPS_FIN_WAIT_2 TCP_FIN_WAIT2
#endif
#ifndef TCPS_TIME_WAIT
# define TCPS_TIME_WAIT TCP_TIME_WAIT
#endif
#ifndef TCPS_CLOSED
# define TCPS_CLOSED TCP_CLOSE
#endif
#ifndef TCPS_CLOSE_WAIT
# define TCPS_CLOSE_WAIT TCP_CLOSE_WAIT
#endif
#ifndef TCPS_LAST_ACK
# define TCPS_LAST_ACK TCP_LAST_ACK
#endif
#ifndef TCPS_LISTEN
# define TCPS_LISTEN TCP_LISTEN
#endif
#ifndef TCPS_CLOSING
# define TCPS_CLOSING TCP_CLOSING
#endif #endif
DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry)

2
dlls/netapi32/nbt.c
View File

@ -68,9 +68,9 @@
#include "config.h" #include "config.h"
#include <stdarg.h> #include <stdarg.h>
#include "winsock2.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winsock2.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "winreg.h" #include "winreg.h"
#include "iphlpapi.h" #include "iphlpapi.h"

8
dlls/wined3d/vertexshader.c
View File

@ -140,7 +140,7 @@ void vshader_lit(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
void vshader_logp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_logp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE; d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE_VAL;
VSTRACE(("executing logp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing logp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
@ -195,14 +195,14 @@ void vshader_nop(void) {
} }
void vshader_rcp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_rcp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
d->x = d->y = d->z = d->w = (0.0f == s0->w) ? HUGE : 1.0f / s0->w; d->x = d->y = d->z = d->w = (0.0f == s0->w) ? HUGE_VAL : 1.0f / s0->w;
VSTRACE(("executing rcp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing rcp: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
void vshader_rsq(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_rsq(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f == tmp_f) ? HUGE : ((1.0f != tmp_f) ? 1.0f / sqrtf(tmp_f) : 1.0f); d->x = d->y = d->z = d->w = (0.0f == tmp_f) ? HUGE_VAL : ((1.0f != tmp_f) ? 1.0f / sqrtf(tmp_f) : 1.0f);
VSTRACE(("executing rsq: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing rsq: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }
@ -246,7 +246,7 @@ void vshader_exp(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
void vshader_log(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) { void vshader_log(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0) {
float tmp_f = fabsf(s0->w); float tmp_f = fabsf(s0->w);
d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE; d->x = d->y = d->z = d->w = (0.0f != tmp_f) ? logf(tmp_f) / logf(2.0f) : -HUGE_VAL;
VSTRACE(("executing log: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n", VSTRACE(("executing log: s0=(%f, %f, %f, %f) => d=(%f, %f, %f, %f)\n",
s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w)); s0->x, s0->y, s0->z, s0->w, d->x, d->y, d->z, d->w));
} }

5
dlls/winedos/ppdev.c
View File

@ -29,10 +29,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif
#include <errno.h> #ifdef HAVE_LINUX_IOCTL_H
# include <linux/ioctl.h>
#endif
#include <linux/ppdev.h> #include <linux/ppdev.h>
#include "winerror.h" #include "winerror.h"

3
dlls/winmm/joystick/joystick.c
View File

@ -45,6 +45,9 @@
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_LINUX_IOCTL_H
#include <linux/ioctl.h>
#endif
#ifdef HAVE_LINUX_JOYSTICK_H #ifdef HAVE_LINUX_JOYSTICK_H
#include <linux/joystick.h> #include <linux/joystick.h>
#define JOYDEV "/dev/js%d" #define JOYDEV "/dev/js%d"

25
dlls/winsock/socket.c
View File

@ -1823,7 +1823,6 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, u_long *argp)
break; break;
case WS_FIONBIO: case WS_FIONBIO:
newcmd=FIONBIO;
if( _get_sock_mask(s) ) if( _get_sock_mask(s) )
{ {
/* AsyncSelect()'ed sockets are always nonblocking */ /* AsyncSelect()'ed sockets are always nonblocking */
@ -1831,11 +1830,25 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, u_long *argp)
SetLastError(WSAEINVAL); SetLastError(WSAEINVAL);
return SOCKET_ERROR; return SOCKET_ERROR;
} }
if (*argp) fd = get_sock_fd( s, 0, NULL );
_enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); if (fd != -1)
else {
_enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); int ret;
return 0; if (*argp)
{
_enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0);
ret = fcntl( fd, F_SETFL, O_NONBLOCK );
}
else
{
_enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING);
ret = fcntl( fd, F_SETFL, 0 );
}
release_sock_fd( s, fd );
if (!ret) return 0;
SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno());
}
return SOCKET_ERROR;
case WS_SIOCATMARK: case WS_SIOCATMARK:
newcmd=SIOCATMARK; newcmd=SIOCATMARK;

3
files/dos_fs.c
View File

@ -37,6 +37,9 @@
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_LINUX_IOCTL_H
#include <linux/ioctl.h>
#endif
#include <time.h> #include <time.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>

3
include/config.h.in
View File

@ -308,6 +308,9 @@
/* Define to 1 if you have the <linux/input.h> header file. */ /* Define to 1 if you have the <linux/input.h> header file. */
#undef HAVE_LINUX_INPUT_H #undef HAVE_LINUX_INPUT_H
/* Define to 1 if you have the <linux/ioctl.h> header file. */
#undef HAVE_LINUX_IOCTL_H
/* Define to 1 if you have the <linux/joystick.h> header file. */ /* Define to 1 if you have the <linux/joystick.h> header file. */
#undef HAVE_LINUX_JOYSTICK_H #undef HAVE_LINUX_JOYSTICK_H

2
server/change.c
View File

@ -79,7 +79,7 @@ static struct list change_list = LIST_INIT(change_list);
static void adjust_changes( int fd, unsigned int filter ) static void adjust_changes( int fd, unsigned int filter )
{ {
#ifdef F_NOTIFY #if defined(F_SETSIG) && defined(F_NOTIFY)
unsigned int val; unsigned int val;
if ( 0 > fcntl( fd, F_SETSIG, SIGIO) ) if ( 0 > fcntl( fd, F_SETSIG, SIGIO) )
return; return;