diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-04-04 00:05:26 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-04-04 00:05:26 +0000 |
| commit | 65072dd89b0f14f9bcab20738f0ce42794433211 (patch) | |
| tree | ee75d92e56204711c7f72bb26ce3890ae82620aa | |
| parent | 93e76d7a59a5c4090ff65d1fe3d44424f8041947 (diff) | |
| download | nspr-hg-65072dd89b0f14f9bcab20738f0ce42794433211.tar.gz | |
Bugzilla bug #34292: checked in OS/2 patch from Skip Nizinski
<snizinsk@us.ibm.com> to build with the VisualAge C++ compiler
which uses the Optlink calling convention.
Modified files: prtypes.h, OS2.mk, prlog.c
(NSPRPUB_CLIENT_BRANCH)
| -rw-r--r-- | config/OS2.mk | 4 | ||||
| -rw-r--r-- | pr/include/prtypes.h | 8 | ||||
| -rw-r--r-- | pr/src/io/prlog.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/config/OS2.mk b/config/OS2.mk index 3f008cb9..b70500bd 100644 --- a/config/OS2.mk +++ b/config/OS2.mk @@ -67,8 +67,8 @@ LIB_SUFFIX = lib DLL_SUFFIX = dll OBJ_SUFFIX = obj -OS_CFLAGS = -W3 -Wcnd- -gm -gd+ -sd- -su4 -ge- -OS_EXE_CFLAGS = -W3 -Wcnd- -gm -gd+ -sd- -su4 +OS_CFLAGS = -W3 -Wcnd- -gm -gd+ -sd- -su4 -ge- -Mp +OS_EXE_CFLAGS = -W3 -Wcnd- -gm -gd+ -sd- -su4 -Mp AR_EXTRA_ARGS = ifdef BUILD_OPT diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h index 02ea6412..b84682ca 100644 --- a/pr/include/prtypes.h +++ b/pr/include/prtypes.h @@ -158,13 +158,9 @@ #define PR_IMPLEMENT(__type) __type #define PR_EXTERN_DATA(__type) extern __type #define PR_IMPLEMENT_DATA(__type) __type -#define PR_CALLBACK +#define PR_CALLBACK _Optlink #define PR_CALLBACK_DECL -#ifndef XP_OS2_VACPP -#define PR_STATIC_CALLBACK(__x) static __x -#else -#define PR_STATIC_CALLBACK(__x) static __x _Optlink -#endif +#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK #else /* Unix */ diff --git a/pr/src/io/prlog.c b/pr/src/io/prlog.c index a43fe5a3..6c2b9072 100644 --- a/pr/src/io/prlog.c +++ b/pr/src/io/prlog.c @@ -55,7 +55,7 @@ static PRLock *_pr_logLock; #endif -#if defined(XP_PC) && !defined(XP_OS2_VACPP) +#if defined(XP_PC) #define strcasecmp stricmp #define strncasecmp strnicmp #endif |