diff --git a/1998/dorssel/dorssel.html b/1998/dorssel/dorssel.html index cd4e2af74..57745e531 100644 --- a/1998/dorssel/dorssel.html +++ b/1998/dorssel/dorssel.html @@ -474,11 +474,11 @@ this is not very pleasant, as some Morse sequences will end up having an ASCII value < 32, i.e. they will be control codes. This would make the initializing (encoding) string awkward. Hence I came up with the following
-length 1: 0010010x E > 00100101 (= '%')
-length 2: 001010xx
-length 3: 00110xxx
-length 4: 0100xxxx Z > 01001100 (= 'L')
-length 5: 011xxxxx 3 > 01100111 (= 'g')
+ length 1: 0010010x E > 00100101 (= '%')
+ length 2: 001010xx
+ length 3: 00110xxx
+ length 4: 0100xxxx Z > 01001100 (= 'L')
+ length 5: 011xxxxx 3 > 01100111 (= 'g')
Notice these encodings in the initialization string. Only the coding for
5 needs an escape (5 = ..... > 01111111 = '\177'). The way the length
is encoded still allows the encoding to be its own counter:
gcc - but not clang - or at least some versions.<
-traditional-cpp option conflicts with some of the other options. Thus the
make alt rule only uses -traditional-cpp.
To see the diff between the original and the alternate code, try:
- cd 1984/decot ; make diff_orig_alt
+ cd 1984/decot ; make diff_orig_alt
Jump to: top
thadgavin.c:60:1: error: conflicting types for 'SDL_main'
- main()
- ^
- /opt/local/include/SDL/SDL_main.h:34:14: note: expanded from macro 'main'
- #define main SDL_main
- ^
- /opt/local/include/SDL/SDL_main.h:35:12: note: previous declaration is here
- extern int SDL_main(int argc, char *argv[]);
- ^
- 1 warning and 1 error generated.
- make: *** [thadgavin_sdl] Error 1
+ thadgavin.c:60:1: error: conflicting types for 'SDL_main'
+ main()
+ ^
+ /opt/local/include/SDL/SDL_main.h:34:14: note: expanded from macro 'main'
+ #define main SDL_main
+ ^
+ /opt/local/include/SDL/SDL_main.h:35:12: note: previous declaration is here
+ extern int SDL_main(int argc, char *argv[]);
+ ^
+ 1 warning and 1 error generated.
+ make: *** [thadgavin_sdl] Error 1
diff --git a/thanks-for-help.md b/thanks-for-help.md index e348b44cf..fe1158a78 100644 --- a/thanks-for-help.md +++ b/thanks-for-help.md @@ -143,7 +143,7 @@ Cody later discovered that the `make alt` rule does not work as the To see the diff between the original and the alternate code, try: ``` - cd 1984/decot ; make diff_orig_alt + cd 1984/decot ; make diff_orig_alt ``` Jump to: [top](#) @@ -3674,19 +3674,21 @@ changed. As was noted in the log at the time: > (but obviously it's a terrible idea) to redefine main() (!!) so that any > program that uses SDL1 has to have the same args as their definition. > This program had 'main()' so the error message was: + ``` - thadgavin.c:60:1: error: conflicting types for 'SDL_main' - main() - ^ - /opt/local/include/SDL/SDL_main.h:34:14: note: expanded from macro 'main' - #define main SDL_main - ^ - /opt/local/include/SDL/SDL_main.h:35:12: note: previous declaration is here - extern int SDL_main(int argc, char *argv[]); - ^ - 1 warning and 1 error generated. - make: *** [thadgavin_sdl] Error 1 + thadgavin.c:60:1: error: conflicting types for 'SDL_main' + main() + ^ + /opt/local/include/SDL/SDL_main.h:34:14: note: expanded from macro 'main' + #define main SDL_main + ^ + /opt/local/include/SDL/SDL_main.h:35:12: note: previous declaration is here + extern int SDL_main(int argc, char *argv[]); + ^ + 1 warning and 1 error generated. + make: *** [thadgavin_sdl] Error 1 ``` + > > Thus `main()` was changed to `int main(int argc, char **argv)`.Thus
main()was changed toint main(int argc, char **argv).