Merge branch 'cc65:master' into kim1

include/c64.h

@@ -145,6 +145,7 @@ extern void c64_ram_emd[];
 extern void c64_ramcart_emd[];
 extern void c64_reu_emd[];
 extern void c64_vdc_emd[];
+extern void c64_rrr_emd[];
 extern void dtv_himem_emd[];
 extern void c64_hitjoy_joy[];
 extern void c64_numpad_joy[];

include/cx16.h

@@ -285,11 +285,11 @@ struct __vera {
 
 /* Audio chip */
 struct __ym2151 {
+    unsigned char       reg;            /* Register number for data */
     union {
-        unsigned char   reg;            /* Register number for data */
+        unsigned char   data;
         unsigned char   status;         /* Busy flag */
     };
-    unsigned char       data;
 };
 #define YM2151  (*(volatile struct __ym2151 *)0x9F40)
 

include/lynx.h

@@ -83,7 +83,6 @@
 #define TGI_COLOR_YELLOW        COLOR_YELLOW
 #define TGI_COLOR_LIGHTGREEN    COLOR_LIGHTGREEN
 #define TGI_COLOR_GREEN         COLOR_GREEN
-#define TGI_COLOR_DARKBROWN     COLOR_DARKBROWN
 #define TGI_COLOR_PURPLE        COLOR_PURPLE
 #define TGI_COLOR_BLUE          COLOR_BLUE
 #define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE

include/serial.h

@@ -148,7 +148,7 @@ unsigned char __fastcall__ ser_open (const struct ser_params* params);
 /* "Open" the port by setting the port parameters and enable interrupts. */
 
 unsigned char ser_close (void);
-/* "Close" the port. Clear buffers and and disable interrupts. */
+/* "Close" the port. Clear buffers and disable interrupts. */
 
 unsigned char __fastcall__ ser_get (char* b);
 /* Get a character from the serial port. If no characters are available, the
@@ -171,6 +171,3 @@ unsigned char __fastcall__ ser_ioctl (unsigned char code, void* data);
 
 /* End of serial.h */
 #endif
-
-
-

include/stddef.h

@@ -54,7 +54,7 @@ typedef unsigned size_t;
 
 /* NULL pointer */
 #ifndef _HAVE_NULL
-#define NULL    0
+#define NULL    ((void *) 0)
 #define _HAVE_NULL
 #endif