Changed compile switches

Author: rijnb

mapcodelib/basics.h

@@ -21,18 +21,6 @@
 
 #define mapcode_dataversion "2.3.0" // coords 2.0.2
 
-static const char *ALIASES =
-  "2UK=2UT,2CG=2CT,1GU=GUM,1UM=UMI,1VI=VIR,1AS=ASM,1MP=MNP,4CX=CXR,4CC=CCK,4NF=NFK,4HM=HMD,COL=5CL,"
-  "5ME=5MX,MEX=5MX,5AG=AGU,5BC=BCN,5BS=BCS,5CM=CAM,5CS=CHP,5CH=CHH,5CO=COA,5DF=DIF,5DG=DUR,5GT=GUA,"
-  "5GR=GRO,5HG=HID,5JA=JAL,5MI=MIC,5MO=MOR,5NA=NAY,5NL=NLE,5OA=OAX,5PB=PUE,5QE=QUE,5QR=ROO,5SL=SLP,"
-  "5SI=SIN,5SO=SON,5TB=TAB,5TL=TLA,5VE=VER,5YU=YUC,5ZA=ZAC,811=8BJ,812=8TJ,813=8HE,814=8SX,815=8NM,"
-  "821=8LN,822=8JL,823=8HL,831=8SH,832=8JS,833=8ZJ,834=8AH,835=8FJ,836=8JX,837=8SD,841=8HA,842=8HB,"
-  "843=8HN,844=8GD,845=8GX,846=8HI,850=8CQ,851=8SC,852=8GZ,853=8YN,854=8XZ,861=8SN,862=8GS,863=8QH,"
-  "864=8NX,865=8XJ,871=TWN,891=HKG,892=MAC,8TW=TWN,8HK=HKG,8MC=MAC,BEL=7BE,KIR=7KI,PRI=7PO,CHE=7CH,"
-  "KHM=7KM,PER=7PM,TAM=7TT,0US=USA,0AU=AUS,0RU=RUS,0CN=CHN,TAA=SHN,ASC=SHN,DGA=IOT,WAK=MHL,JTN=UMI,"
-  "MID=1HI,1PR=PRI,5TM=TAM,TAM=TAM,2OD=2OR,";
-
-
 #define MAX_CCODE 533 // nr of territories in this database
 
 static const char *entity_iso = ""

unittest/README.md

@@ -3,11 +3,11 @@
 To build the unit tests, execute:
 
     cd unittest
-    gcc -O unittest.c -o unittest
+    gcc -O unittest.c -lm -lpthread -o unittest
 
 (Or if you need to make sure there are no warnings:)
 
-    gcc -Wall -Wstrict-prototypes -Wshorten-64-to-32 -O unittest.c -o unittest
+    gcc -Wall -O unittest.c -lm -lpthread -o unittest
 
 To execute the tests, simply execute:
 

unittest/unittest.c

@@ -500,8 +500,9 @@ struct context_test_around {
 
 
 int join_threads(pthread_t *threads, struct context_test_around *contexts, int total) {
+    int i = 0;
     int nrTests = 0;
-    for (int i = 0; i < total; ++i) {
+    for (i = 0; i < total; ++i) {
         if (pthread_join(threads[i], 0)) {
             found_error();
             printf("*** ERROR *** Error joining thread %d of %d\n", i, total);

utility/README.md

@@ -3,11 +3,11 @@
 This directory contains a Mapcode encoding/decoding utility.
 To build the original Mapcode tool, execute:
 
-    gcc -O mapcode.cpp -o mapcode
+    gcc -O mapcode.cpp -lm -lpthread -o mapcode
 
 (Or if you need to make sure there are no warnings:)
 
-    gcc -Wall -Wstrict-prototypes -Wshorten-64-to-32 -O mapcode.cpp -o mapcode
+    gcc -Wall -O mapcode.cpp -lm -lpthread -o mapcode
 
 For help, simply execute: