diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-09-16 20:30:38 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-09-16 20:30:38 +0000 |
| commit | 0b0ef5746b0ea4a5e61dc8f7c9fb9a413a1e853c (patch) | |
| tree | ff3da2acd47a14888545261fbe31dda7a709446a | |
| parent | 1009e498e855fcbee74ba6bdff8e8fe98aaa8eeb (diff) | |
| download | nspr-hg-0b0ef5746b0ea4a5e61dc8f7c9fb9a413a1e853c.tar.gz | |
Bugzilla bug 215581: checked in the rest of the GCC 3.2.2 for OS/2 changes
from Javier Pedemonte <pedemont@us.ibm.com>.
Modified Files: prio.h prtypes.h os2misc.c
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
| -rw-r--r-- | pr/include/prio.h | 5 | ||||
| -rw-r--r-- | pr/include/prtypes.h | 15 | ||||
| -rw-r--r-- | pr/src/md/os2/os2misc.c | 7 |
3 files changed, 7 insertions, 20 deletions
diff --git a/pr/include/prio.h b/pr/include/prio.h index d9843dc3..50bfa811 100644 --- a/pr/include/prio.h +++ b/pr/include/prio.h @@ -197,7 +197,12 @@ union PRNetAddr { #if defined(XP_UNIX) || defined(XP_OS2) struct { /* Unix domain socket address */ PRUint16 family; /* address family (AF_UNIX) */ +#ifdef XP_OS2 + char path[108]; /* null-terminated pathname */ + /* bind fails if size is not 108. */ +#else char path[104]; /* null-terminated pathname */ +#endif } local; #endif }; diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h index b7ee24f4..819f9c16 100644 --- a/pr/include/prtypes.h +++ b/pr/include/prtypes.h @@ -158,21 +158,6 @@ #define PR_CALLBACK_DECL #define PR_STATIC_CALLBACK(__x) static __x -#elif defined(XP_OS2_VACPP) - -#define PR_EXPORT(__type) extern __type -#define PR_EXPORT_DATA(__type) extern __type -#define PR_IMPORT(__type) extern __type -#define PR_IMPORT_DATA(__type) extern __type - -#define PR_EXTERN(__type) extern __type -#define PR_IMPLEMENT(__type) __type -#define PR_EXTERN_DATA(__type) extern __type -#define PR_IMPLEMENT_DATA(__type) __type -#define PR_CALLBACK _Optlink -#define PR_CALLBACK_DECL -#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK - #else /* Unix */ #define PR_EXPORT(__type) extern __type diff --git a/pr/src/md/os2/os2misc.c b/pr/src/md/os2/os2misc.c index d14972c6..4e9bb932 100644 --- a/pr/src/md/os2/os2misc.c +++ b/pr/src/md/os2/os2misc.c @@ -380,12 +380,9 @@ errorExit: PRStatus _PR_DetachOS2Process(PRProcess *process) { - /* This is basically what they did on Windows (CloseHandle) - * but I don't think it will do much on OS/2. A process is - * either created as a child or not. You can't 'detach' it - * later on. + /* On OS/2, a process is either created as a child or not. + * You can't 'detach' it later on. */ - DosClose(process->md.pid); PR_DELETE(process); return PR_SUCCESS; } |