diff options
| author | blythe%netscape.com <devnull@localhost> | 2002-02-07 22:18:12 +0000 |
|---|---|---|
| committer | blythe%netscape.com <devnull@localhost> | 2002-02-07 22:18:12 +0000 |
| commit | 1cfd560e3ca584a681af2645964161fb1e42bdf8 (patch) | |
| tree | 39e26226bb471ae25cc123c78f1a42ed4bb97aac | |
| parent | e56ad136990a7baa8514522daff3d2742905d0ec (diff) | |
| download | nspr-hg-1cfd560e3ca584a681af2645964161fb1e42bdf8.tar.gz | |
no strerror or errno, no getprotoby* apis in WinCE
| -rw-r--r-- | pr/include/md/_wince.h | 2 | ||||
| -rw-r--r-- | pr/src/misc/prerrortable.c | 14 | ||||
| -rw-r--r-- | pr/src/misc/prnetdb.c | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/pr/include/md/_wince.h b/pr/include/md/_wince.h index 3f245068..6cc30b43 100644 --- a/pr/include/md/_wince.h +++ b/pr/include/md/_wince.h @@ -531,6 +531,6 @@ struct stat { #define _S_IFREG 0100000 /* stat, is a normal file */ #define _S_IREAD 0000400 /* stat, can read */ #define _S_IWRITE 0000200 /* stat, can write */ -#define ENOMEM /* errno, out of memory */ +#define ENOMEM 12 /* errno, out of memory */ #endif /* nspr_wince_defs_h___ */ diff --git a/pr/src/misc/prerrortable.c b/pr/src/misc/prerrortable.c index acdf426d..d5fdf4af 100644 --- a/pr/src/misc/prerrortable.c +++ b/pr/src/misc/prerrortable.c @@ -149,7 +149,11 @@ PR_ErrorToString(PRErrorCode code, PRLanguageCode language) } if (code >= 0 && code < 256) { +#if !defined(WINCE) return strerror(code); +#else + return "errno range error"; +#endif } offset = (int) (code & ((1<<ERRCODE_RANGE)-1)); @@ -204,14 +208,11 @@ PR_ErrorInstallTable(const struct PRErrorTable *table) new_et = (struct PRErrorTableList *) PR_Malloc(sizeof(struct PRErrorTableList)); -#if !defined(WINCE) if (!new_et) +#if !defined(WINCE) return errno; /* oops */ #else - if(NULL == new_et) - { return ENOMEM; - } #endif new_et->table = table; if (callback_newtable) { @@ -232,8 +233,13 @@ PR_ErrorInstallCallback(const char * const * languages, { struct PRErrorTableList *et; +#if !defined(WINCE) assert(strcmp(languages[0], "i-default") == 0); assert(strcmp(languages[1], "en") == 0); +#else + PR_ASSERT(strcmp(languages[0], "i-default") == 0); + PR_ASSERT(strcmp(languages[1], "en") == 0); +#endif callback_languages = languages; callback_lookup = lookup; diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index 64006266..a54a5fb4 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -842,6 +842,8 @@ static struct protoent *getprotobyname_r(const char* name) { #ifdef XP_OS2_VACPP return getprotobyname((char *)name); +#elif defined(WINCE) + return NULL; #else return getprotobyname(name); #endif @@ -849,7 +851,11 @@ static struct protoent *getprotobyname_r(const char* name) static struct protoent *getprotobynumber_r(PRInt32 number) { +#if !defined(WINCE) return getprotobynumber(number); +#else + return NULL; +#endif } /* getprotobynumber_r */ #endif /* !defined(_PR_HAVE_GETPROTO_R) */ |