Merge pull request #332 from greg-king5/interrupt-functions

Add C-code interfaces for the CBM Kernal functions SCNKEY and UDTIM.

diff --git a/samples/Makefile b/samples/Makefile
index 00a9ce41d6d68617187f5f40711d9d23c622d0d3..3a60798dafeee75ed608e6f6a32f6f96472ba786 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -35,26 +35,26 @@ else
 endif
 
 ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
-TARGET_PATH := $(shell $(CL) --print-target-path)
+  TARGET_PATH := $(shell $(CL) --print-target-path)
 
-EMD := $(wildcard $(TARGET_PATH)/$(SYS)/drv/emd/*)
-MOU := $(wildcard $(TARGET_PATH)/$(SYS)/drv/mou/*)
-TGI := $(wildcard $(TARGET_PATH)/$(SYS)/drv/tgi/*)
+  EMD := $(wildcard $(TARGET_PATH)/$(SYS)/drv/emd/*)
+  MOU := $(wildcard $(TARGET_PATH)/$(SYS)/drv/mou/*)
+  TGI := $(wildcard $(TARGET_PATH)/$(SYS)/drv/tgi/*)
 
-# This one comes with VICE
-C1541 ?= c1541
+  # This one comes with VICE
+  C1541 ?= c1541
 
-# For this one see http://applecommander.sourceforge.net/
-AC ?= ac.jar
+  # For this one see http://applecommander.sourceforge.net/
+  AC ?= ac.jar
 
-# For this one see http://www.horus.com/~hias/atari/
-DIR2ATR ?= dir2atr
+  # For this one see http://www.horus.com/~hias/atari/
+  DIR2ATR ?= dir2atr
 
-DISK_c64       = samples.d64
-DISK_apple2    = samples.dsk
-DISK_apple2enh = samples.dsk
-DISK_atari     = samples.atr
-DISK_atarixl   = samples.atr
+  DISK_c64       = samples.d64
+  DISK_apple2    = samples.dsk
+  DISK_apple2enh = samples.dsk
+  DISK_atari     = samples.atr
+  DISK_atarixl   = samples.atr
 endif
 
 # --------------------------------------------------------------------------

diff --git a/src/cc65/typeconv.c b/src/cc65/typeconv.c
index 78f43a50c5ed09a71c99dd18c572aa66ed242262..47ab993c1da764317f1c287752b39859e97389f9 100644 (file)
--- a/src/cc65/typeconv.c
+++ b/src/cc65/typeconv.c
@@ -237,7 +237,7 @@ void TypeConversion (ExprDesc* Expr, Type* NewType)
                 switch (TypeCmp (NewType, Expr->Type)) {
 
                     case TC_INCOMPATIBLE:
-                        Error ("Incompatible pointer types at '%s'", (!Expr->Sym? Expr->Sym->Name : "Unknown"));
+                        Error ("Incompatible pointer types at '%s'", (Expr->Sym? Expr->Sym->Name : "Unknown"));
                         break;
 
                     case TC_QUAL_DIFF: