diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | builds/dos/detect.mk | 14 | ||||
| -rw-r--r-- | src/pcf/pcfdriver.c | 2 |
3 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2001-04-10 Francesco Zappa Nardelli <francesco.zappa.nardelli@ens.fr> + + * src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value. + +2001-04-09 Laurence Withers <lwithers@lwithers.demon.co.uk> + + * builds/dos/detect.mk: Add support for bash. + 2001-04-05 Werner Lemberg <wl@gnu.org> * builds/os2/*.mk: These files have been forgotten to update to diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 65eb42d36..a325b9925 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -40,7 +40,7 @@ ifeq ($(PLATFORM),ansi) # substring `MDOS\COMMAND' # ifeq ($(is_dos),) - is_dos := $(findstring MDOS\COMMAND,$(COMSPEC)) + is_dos := $(findstring MDOS\COMMAND,$(COMSPEC)) endif endif # test COMSPEC @@ -53,8 +53,6 @@ ifeq ($(PLATFORM),ansi) endif # test PLATFORM ansi ifeq ($(PLATFORM),dos) - DELETE := del - COPY := copy # Use DJGPP (i.e. gcc) by default. # @@ -98,7 +96,15 @@ ifeq ($(PLATFORM),dos) .PHONY: borlandc endif - setup: dos_setup + ifneq ($(findstring bash,$(SHELL)),) # check for bash + DELETE := rm + COPY := cp + setup: std_setup + else + DELETE := del + COPY := copy + setup: dos_setup + endif endif # test PLATFORM dos diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c index beb8f5557..18d4fffbe 100644 --- a/src/pcf/pcfdriver.c +++ b/src/pcf/pcfdriver.c @@ -264,7 +264,7 @@ THE SOFTWARE. return en_table[mid].glyph; } - return face->defaultChar; + return 0; } |