1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
Index: cheesecutter/src/asm/acme.c
===================================================================
--- cheesecutter.orig/src/asm/acme.c
+++ cheesecutter/src/asm/acme.c
@@ -128,7 +128,7 @@ static bool do_actual_work(void) {
return(FALSE);
}
-char* acme_assemble(const char* src, const int *length, char *error) {
+char* acme_assemble(const char* src, int *length, char *error) {
error_message = error;
source = src;
msg_stream = stdout;
Index: cheesecutter/src/asm/config.h
===================================================================
--- cheesecutter.orig/src/asm/config.h
+++ cheesecutter/src/asm/config.h
@@ -7,6 +7,7 @@
#ifndef config_H
#define config_H
+#include <stdbool.h>
// types
typedef unsigned int zone_t;
@@ -50,7 +51,6 @@ typedef struct result_int_t result_int_t
#endif
// Boolean values
#ifndef FALSE
-typedef int bool;
#define FALSE 0
#define TRUE 1
#endif
Index: cheesecutter/src/asm/global.h
===================================================================
--- cheesecutter.orig/src/asm/global.h
+++ cheesecutter/src/asm/global.h
@@ -87,7 +87,7 @@ extern void Parse_until_eob_or_eof(void)
// Skip space. If GotByte is CHAR_SOB ('{'), parse block and return TRUE.
// Otherwise (if there is no block), return FALSE.
// Don't forget to call EnsureEOL() afterwards.
-extern int Parse_optional_block(void);
+extern bool Parse_optional_block(void);
// Output a warning.
// This means the produced code looks as expected. But there has been a
// situation that should be reported to the user, for example ACME may have
Index: cheesecutter/src/asm/output.h
===================================================================
--- cheesecutter.orig/src/asm/output.h
+++ cheesecutter/src/asm/output.h
@@ -40,7 +40,7 @@ extern bool Output_set_output_format(voi
// write smallest-possible part of memory buffer to file
extern void Output_save_file(FILE* fd);
// send final output as binary
-extern char* Output_get_final_data();
+extern char* Output_get_final_data(int *length);
// Call when "*=EXPRESSION" is parsed
extern void Output_start_segment(void);
// Show start and end of current segment
|
