From 762b3a4c2246ac817da7bac7ccb78889f117ca93 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 4 May 2012 14:18:12 +0300 Subject: DJGPP --> __DJGPP__ --- ChangeLog | 5 +++++ getopt.c | 2 +- mbsupport.h | 4 ++-- missing_d/ChangeLog | 4 ++++ missing_d/snprintf.c | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f9adbb..41196c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-04 Arnold D. Robbins + + * getopt.c [DJGPP]: Change to __DJGPP__. + * mbsupport.h [DJGPP]: Change to __DJGPP__. + 2012-05-01 Arnold D. Robbins * dfa.c: Sync with GNU grep. RRI code now there, needed additional diff --git a/getopt.c b/getopt.c index 58df01a0..d0996d4a 100644 --- a/getopt.c +++ b/getopt.c @@ -58,7 +58,7 @@ /* This needs to come after some library #include to get __GNU_LIBRARY__ defined. */ -#if defined (__GNU_LIBRARY__) || defined (__CYGWIN__) || defined(DJGPP) +#if defined (__GNU_LIBRARY__) || defined (__CYGWIN__) || defined(__DJGPP__) /* Don't include stdlib.h for * non-GNU C libraries * non-Cygwin diff --git a/mbsupport.h b/mbsupport.h index db6788ce..1eb1a444 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -71,7 +71,7 @@ /* All this glop is for dfa.c. Bleah. */ -#ifndef DJGPP +#ifndef __DJGPP__ #define wchar_t char #endif @@ -81,7 +81,7 @@ #define WEOF EOF #define towupper toupper #define towlower tolower -#ifndef DJGPP +#ifndef __DJGPP__ #define btowc(x) ((int)x) #endif #define iswalnum isalnum diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog index c6913bc2..ff29a926 100644 --- a/missing_d/ChangeLog +++ b/missing_d/ChangeLog @@ -1,3 +1,7 @@ +2012-05-04 Arnold D. Robbins + + * snprintf.c [DJGPP]: Change to __DJGPP__. + 2012-03-28 Arnold D. Robbins * 4.0.1: Release tar ball made. diff --git a/missing_d/snprintf.c b/missing_d/snprintf.c index 254a8e0b..12e50925 100644 --- a/missing_d/snprintf.c +++ b/missing_d/snprintf.c @@ -86,10 +86,10 @@ safe_tmpfile (void) if ((fd = mkstemp (tmpfilename)) < 0) return NULL; -#if ! defined(DJGPP) && ! defined(MSDOS) && ! defined(_MSC_VER) \ +#if ! defined(__DJGPP__) && ! defined(MSDOS) && ! defined(_MSC_VER) \ && ! defined(_WIN32) && ! defined(__CRTRSXNT__) && ! defined(__EMX__) \ && ! defined(__MINGW32__) && ! defined(__WIN32__) - /* If not MS, unlink after opening. */ + /* If not MS or OS/2, unlink after opening. */ unlink (tmpfilename); free(tmpfilename); tmpfilename = NULL; -- cgit v1.2.3