diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /libXfont/src/fc/fsio.h | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXfont/src/fc/fsio.h')
| -rw-r--r-- | libXfont/src/fc/fsio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXfont/src/fc/fsio.h b/libXfont/src/fc/fsio.h index bd0c621e8..2bb8e0b73 100644 --- a/libXfont/src/fc/fsio.h +++ b/libXfont/src/fc/fsio.h @@ -110,9 +110,9 @@ typedef struct _fs_fpe_data { CARD32 brokenWriteTime; /* time to retry broken write */ CARD32 blockedConnectTime; /* time to abort blocked connect */ CARD32 brokenConnectionTime; /* time to retry broken connection */ - + FSBlockDataPtr blockedRequests; - + struct _XtransConnInfo *trans_conn; /* transport connection object */ } FSFpeRec; @@ -129,8 +129,8 @@ typedef struct _fs_fpe_data { #define FSIO_ERROR -1 extern Bool _fs_reopen_server ( FSFpePtr conn ); -extern int _fs_write ( FSFpePtr conn, char *data, long size ); -extern int _fs_write_pad ( FSFpePtr conn, char *data, long len ); +extern int _fs_write ( FSFpePtr conn, const char *data, long size ); +extern int _fs_write_pad ( FSFpePtr conn, const char *data, long len ); extern int _fs_wait_for_readable ( FSFpePtr conn, int ms ); extern long _fs_pad_length (long len); |