diff options
Diffstat (limited to 'src/pal')
| -rw-r--r-- | src/pal/prebuilt/inc/asm_version.h | 7 | ||||
| -rw-r--r-- | src/pal/src/locale/utf8.cpp | 8 | ||||
| -rw-r--r-- | src/pal/src/misc/dbgmsg.cpp | 4 | ||||
| -rw-r--r-- | src/pal/src/safecrt/safecrt_output_l.cpp | 25 |
4 files changed, 0 insertions, 44 deletions
diff --git a/src/pal/prebuilt/inc/asm_version.h b/src/pal/prebuilt/inc/asm_version.h index f1f2b0ad7d..a9a9fed18a 100644 --- a/src/pal/prebuilt/inc/asm_version.h +++ b/src/pal/prebuilt/inc/asm_version.h @@ -1,15 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if defined(SILVERLIGHT) || defined(FEATURE_CORECLR) #define asm_rmj 4 #define asm_rmm 0 #define asm_rup 0 #define asm_rpt 0 -#else -#define asm_rmj 4 -#define asm_rmm 0 -#define asm_rup 0 -#define asm_rpt 0 -#endif diff --git a/src/pal/src/locale/utf8.cpp b/src/pal/src/locale/utf8.cpp index 87493a9673..ca55a4e23b 100644 --- a/src/pal/src/locale/utf8.cpp +++ b/src/pal/src/locale/utf8.cpp @@ -1399,7 +1399,6 @@ public: EncodeChar: -#ifdef FASTLOOP int availableBytes = PtrDiff(pEnd, pSrc); // don't fall into the fast decoding loop if we don't have enough bytes @@ -1565,7 +1564,6 @@ public: // extra byte charCount--; } -#endif // FASTLOOP // no pending bits at this point ch = 0; @@ -1815,7 +1813,6 @@ public: *pTarget = (WCHAR)ch; pTarget++; -#ifdef FASTLOOP int availableChars = PtrDiff(pAllocatedBufferEnd, pTarget); int availableBytes = PtrDiff(pEnd, pSrc); @@ -2054,7 +2051,6 @@ public: // subtract an extra count from pStop so that we don't overrun the input. pStop--; } -#endif // FASTLOOP Contract::Assert(pTarget <= pAllocatedBufferEnd, "[UTF8Encoding.GetChars]pTarget <= pAllocatedBufferEnd"); @@ -2301,7 +2297,6 @@ public: pTarget++; -#ifdef FASTLOOP // If still have fallback don't do fast loop if (fallbackBuffer != nullptr && (ch = fallbackBuffer->InternalGetNextChar()) != 0) goto ProcessChar; @@ -2480,7 +2475,6 @@ public: Contract::Assert(pTarget <= pAllocatedBufferEnd, "[UTF8Encoding.GetBytes]pTarget <= pAllocatedBufferEnd"); -#endif // FASTLOOP // no pending char at this point ch = 0; @@ -2645,7 +2639,6 @@ public: } #endif -#ifdef FASTLOOP // If still have fallback don't do fast loop if (fallbackBuffer != nullptr && (ch = fallbackBuffer->InternalGetNextChar()) != 0) { @@ -2797,7 +2790,6 @@ public: // byteCount - the last byte is already included } -#endif // FASTLOOP // no pending char at this point ch = 0; diff --git a/src/pal/src/misc/dbgmsg.cpp b/src/pal/src/misc/dbgmsg.cpp index d6f173f160..5eb5ebf9ba 100644 --- a/src/pal/src/misc/dbgmsg.cpp +++ b/src/pal/src/misc/dbgmsg.cpp @@ -50,11 +50,7 @@ using namespace CorUnix; /* append mode file I/O is safer */ #define _PAL_APPEND_DBG_OUTPUT_ -#if defined(_PAL_APPEND_DBG_OUTPUT_) static const char FOPEN_FLAGS[] = "at"; -#else -static const char FOPEN_FLAGS[] = "wt"; -#endif /* number of ENTRY nesting levels to indicate with a '.' */ #define MAX_NESTING 50 diff --git a/src/pal/src/safecrt/safecrt_output_l.cpp b/src/pal/src/safecrt/safecrt_output_l.cpp index d6844f4f8b..6cc105abf9 100644 --- a/src/pal/src/safecrt/safecrt_output_l.cpp +++ b/src/pal/src/safecrt/safecrt_output_l.cpp @@ -84,9 +84,6 @@ Buffer size required to be passed to _gcvt, fcvt and other fp conversion routine // SNIP -srs 7/3/07 -#ifndef _CFLTCVT -#define _CFLTCVT _cfltcvt -#endif /* _CFLTCVT */ #ifndef _CLDCVT #define _CLDCVT _cldcvt @@ -146,14 +143,6 @@ Buffer size required to be passed to _gcvt, fcvt and other fp conversion routine #define BUFFERSIZE 512 #define MAXPRECISION BUFFERSIZE -#if BUFFERSIZE < _CVTBUFSIZE + 6 -/* - * Buffer needs to be big enough for default minimum precision - * when converting floating point needs bigger buffer, and malloc - * fails - */ -#error Conversion buffer too small for max double. -#endif /* BUFFERSIZE < _CVTBUFSIZE + 6 */ /* flag definitions */ #define FL_SIGN 0x00001 /* put plus or minus in front */ @@ -935,11 +924,6 @@ int __cdecl _output ( else #endif /* !LONG_IS_INT */ -#if !SHORT_IS_INT - if (flags & FL_SHORT) - *(short *)p = (short) charsout; - else -#endif /* !SHORT_IS_INT */ *(int *)p = charsout; no_output = 1; /* force no output */ @@ -1085,15 +1069,6 @@ int __cdecl _output ( else #endif /* !LONG_IS_INT */ -#if !SHORT_IS_INT - if (flags & FL_SHORT) { - if (flags & FL_SIGNED) - l = (short) get_int_arg(&argptr); /* sign extend */ - else - l = (unsigned short) get_int_arg(&argptr); /* zero-extend*/ - - } else -#endif /* !SHORT_IS_INT */ { if (flags & FL_SIGNED) l = get_int_arg(&argptr); /* sign extend */ |