diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-01-12 21:37:38 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-01-12 21:37:38 +0000 |
| commit | acb50b83e3545f820e5ffab3600b1f8377dfeb16 (patch) | |
| tree | 74f5e3109bc90fe634d839451691e223b442fd07 | |
| parent | f9382fe13d4ac4350399123756e0862b3c149ed4 (diff) | |
| download | nspr-hg-acb50b83e3545f820e5ffab3600b1f8377dfeb16.tar.gz | |
Use only one definition of PipeAvailable and PipeAvailable64, which
requires _PR_MD_PIPEAVAILABLE. Define _MD_PIPEAVAILABLE for Mac.
Modified files: _macos.h, prfile.c
| -rw-r--r-- | pr/include/md/_macos.h | 6 | ||||
| -rw-r--r-- | pr/src/io/prfile.c | 16 |
2 files changed, 6 insertions, 16 deletions
diff --git a/pr/include/md/_macos.h b/pr/include/md/_macos.h index 510fbcb6..e6ecd016 100644 --- a/pr/include/md/_macos.h +++ b/pr/include/md/_macos.h @@ -371,6 +371,12 @@ extern char* _MD_ReadDir(struct _MDDir *md,PRIntn flags); #define _MD_RMDIR _MD_Delete /* +** Pipe I/O Related definitions (not implemented) +*/ + +#define _MD_PIPEAVAILABLE(fd) -1 + +/* ** Socket I/O Related definitions */ diff --git a/pr/src/io/prfile.c b/pr/src/io/prfile.c index e58e8fff..accc618b 100644 --- a/pr/src/io/prfile.c +++ b/pr/src/io/prfile.c @@ -155,7 +155,6 @@ static PRInt64 PR_CALLBACK FileAvailable64(PRFileDesc *fd) return result; } -#if defined(XP_UNIX) || defined(WIN32) static PRInt32 PR_CALLBACK PipeAvailable(PRFileDesc *fd) { PRInt32 rv; @@ -169,21 +168,6 @@ static PRInt64 PR_CALLBACK PipeAvailable64(PRFileDesc *fd) LL_I2L(rv, _PR_MD_PIPEAVAILABLE(fd)); return rv; } -#else -static PRInt32 PR_CALLBACK PipeAvailable(PRFileDesc *fd) -{ - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return -1; -} - -static PRInt64 PR_CALLBACK PipeAvailable64(PRFileDesc *fd) -{ - PRInt64 rv; - LL_I2L(rv, -1); - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return rv; -} -#endif static PRStatus PR_CALLBACK PipeSync(PRFileDesc *fd) { |