diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /db | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'db')
| -rw-r--r-- | db/mork/src/morkConfig.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/db/mork/src/morkConfig.h b/db/mork/src/morkConfig.h index dbd4ebdf5b..370cf17139 100644 --- a/db/mork/src/morkConfig.h +++ b/db/mork/src/morkConfig.h @@ -18,6 +18,10 @@ // { %%%%% begin platform defs peculiar to Mork %%%%% +#ifdef XP_MACOSX +#define MORK_MAC 1 +#endif + #ifdef XP_WIN #define MORK_WIN 1 #endif @@ -28,7 +32,7 @@ // } %%%%% end platform defs peculiar to Mork %%%%% -#if defined(MORK_WIN) || defined(MORK_UNIX) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) #include <stdio.h> #include <ctype.h> #include <errno.h> @@ -84,15 +88,20 @@ void mork_fileflush(FILE * file); #define mork_kTAB '\011' #define mork_kCRLF "\015\012" /* A CR LF equivalent string */ -#if defined(MORK_WIN) -# define mork_kNewline "\015\012" -# define mork_kNewlineSize 2 +#if defined(MORK_MAC) +# define mork_kNewline "\015" +# define mork_kNewlineSize 1 #else -# if defined(MORK_UNIX) -# define mork_kNewline "\012" -# define mork_kNewlineSize 1 -# endif /* MORK_UNIX */ -#endif /* MORK_WIN */ +# if defined(MORK_WIN) +# define mork_kNewline "\015\012" +# define mork_kNewlineSize 2 +# else +# if defined(MORK_UNIX) +# define mork_kNewline "\012" +# define mork_kNewlineSize 1 +# endif /* MORK_UNIX */ +# endif /* MORK_WIN */ +#endif /* MORK_MAC */ // { %%%%% begin assertion macro %%%%% extern void mork_assertion_signal(const char* inMessage); @@ -105,7 +114,7 @@ extern void mork_assertion_signal(const char* inMessage); // { %%%%% begin standard c utility methods %%%%% -#if defined(MORK_WIN) || defined(MORK_UNIX) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) #define MORK_USE_C_STDLIB 1 #endif /*MORK_WIN*/ |