diff options
| author | wtc%google.com <devnull@localhost> | 2009-05-06 05:40:39 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-05-06 05:40:39 +0000 |
| commit | 70eab9ec5d635fffed0099faac90b964e4adb087 (patch) | |
| tree | aba26ff7c9f47e742b45187fa9ce96416d45e3cf /pr/include/private/primpl.h | |
| parent | ebc2e0fd858b7882dee5c507aff0f562785b20f7 (diff) | |
| download | nspr-hg-70eab9ec5d635fffed0099faac90b964e4adb087.tar.gz | |
Bug 476996: removed the remaining XP_MAC code. The patch is contributed by
Zack Weinberg <zweinberg@mozilla.com>. r=wtc.
Diffstat (limited to 'pr/include/private/primpl.h')
| -rw-r--r-- | pr/include/private/primpl.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/pr/include/private/primpl.h b/pr/include/private/primpl.h index c0f4a3ab..15971bce 100644 --- a/pr/include/private/primpl.h +++ b/pr/include/private/primpl.h @@ -73,13 +73,8 @@ typedef struct PRSegment PRSegment; -#ifdef XP_MAC -#include "prosdep.h" -#include "probslet.h" -#else #include "md/prosdep.h" #include "obsolete/probslet.h" -#endif /* XP_MAC */ #ifdef _PR_HAVE_POSIX_SEMAPHORES #include <semaphore.h> @@ -328,10 +323,8 @@ NSPR_API(PRInt32) _pr_intsOff; #define _MD_LAST_THREAD() (_pr_lastThread) #define _MD_SET_LAST_THREAD(t) (_pr_lastThread = t) -#ifndef XP_MAC #define _MD_GET_INTSOFF() (_pr_intsOff) #define _MD_SET_INTSOFF(_val) (_pr_intsOff = _val) -#endif /* The unbalanced curly braces in these two macros are intentional */ @@ -376,20 +369,12 @@ extern PRInt32 _native_threads_only; #else -#ifdef XP_MAC - -#define _PR_INTSOFF(_is) _MD_INTSOFF(_is) - -#else /* XP_MAC */ - #define _PR_INTSOFF(_is) \ PR_BEGIN_MACRO \ (_is) = _PR_MD_GET_INTSOFF(); \ _PR_MD_SET_INTSOFF(1); \ PR_END_MACRO -#endif /* XP_MAC */ - #define _PR_FAST_INTSON(_is) \ PR_BEGIN_MACRO \ _PR_MD_SET_INTSOFF(_is); \ @@ -1091,11 +1076,6 @@ extern PRStatus _PR_MD_DELETE_SEMAPHORE(const char *osname); extern void _PR_MD_INIT_FILEDESC(PRFileDesc *fd); #define _PR_MD_INIT_FILEDESC _MD_INIT_FILEDESC -#ifdef XP_MAC -extern void _PR_MD_FREE_FILEDESC(PRFileDesc *fd); -#define _PR_MD_FREE_FILEDESC _MD_FREE_FILEDESC -#endif - extern void _PR_MD_MAKE_NONBLOCK(PRFileDesc *fd); #define _PR_MD_MAKE_NONBLOCK _MD_MAKE_NONBLOCK |