libuv 1.45.0, #include cleanup, probably something else.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4308 ed5197a5-7fde-0310-b194-c3ffbd925b24

src/bcrypt.js.c

@@ -2,6 +2,8 @@
 
 #include "ow-crypt.h"
 
+#include "quickjs.h"
+
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

src/bcrypt.js.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "quickjs.h"
+typedef struct JSContext JSContext;
 
 void tf_bcrypt_register(JSContext* context);

src/database.js.c

@@ -5,10 +5,11 @@
 #include "ssb.h"
 #include "task.h"
 
+#include "sqlite3.h"
+
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
-#include <sqlite3.h>
 
 static JSClassID _database_class_id;
 static int _database_count;

src/database.js.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "quickjs.h"
+typedef struct JSContext JSContext;
 
 void tf_database_register(JSContext* context);

src/file.js.c

@@ -5,10 +5,10 @@
 #include "util.js.h"
 
 #include "unzip.h"
+#include "uv.h"
 
 #include <stdbool.h>
 #include <string.h>
-#include <uv.h>
 
 #ifdef _WIN32
 #include <windows.h>

src/file.js.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "quickjs.h"
+typedef struct JSContext JSContext;
 
 void tf_file_register(JSContext* context);

src/main.c

@@ -10,10 +10,10 @@
 #include "tests.h"
 #include "util.js.h"
 
-#include <backtrace.h>
-#include <quickjs.h>
-#include <sqlite3.h>
-#include <xopt.h>
+#include "backtrace.h"
+#include "quickjs.h"
+#include "sqlite3.h"
+#include "xopt.h"
 
 #include <stdlib.h>
 #include <string.h>

src/mem.c

@@ -2,14 +2,13 @@
 
 #include "util.js.h"
 
-#include <uv.h>
+#include "uv.h"
+#include "quickjs.h"
+#include "sqlite3.h"
+#include "uv.h"
 
 #include <openssl/crypto.h>
 
-#include <quickjs.h>
-#include <sqlite3.h>
-#include <uv.h>
-
 #include <string.h>
 #include <stdbool.h>
 

src/packetstream.c

@@ -2,7 +2,7 @@
 
 #include "mem.h"
 
-#include <uv.h>
+#include "uv.h"
 
 #include <stdbool.h>
 #include <string.h>

src/socket.js.c

@@ -6,9 +6,10 @@
 #include "tlscontext.js.h"
 #include "util.js.h"
 
+#include "uv.h"
+
 #include <assert.h>
 #include <string.h>
-#include <uv.h>
 
 typedef int promiseid_t;
 typedef struct _socket_t socket_t;

src/ssb.c

@@ -8,22 +8,23 @@
 #include "trace.h"
 #include "util.js.h"
 
+#include "quickjs.h"
+#include "sodium/crypto_auth.h"
+#include "sodium/crypto_box.h"
+#include "sodium/crypto_hash_sha256.h"
+#include "sodium/crypto_scalarmult.h"
+#include "sodium/crypto_scalarmult_curve25519.h"
+#include "sodium/crypto_secretbox.h"
+#include "sodium/crypto_sign.h"
+#include "sodium/utils.h"
+#include "sqlite3.h"
+#include "uv.h"
+
 #include <assert.h>
-#include <quickjs.h>
-#include <sodium/crypto_auth.h>
-#include <sodium/crypto_box.h>
-#include <sodium/crypto_hash_sha256.h>
-#include <sodium/crypto_scalarmult.h>
-#include <sodium/crypto_scalarmult_curve25519.h>
-#include <sodium/crypto_secretbox.h>
-#include <sodium/crypto_sign.h>
-#include <sodium/utils.h>
-#include <sqlite3.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <uv.h>
 
 #ifndef _WIN32
 #ifndef __ANDROID__
@@ -2517,7 +2518,7 @@ static void _tf_on_connect_getaddrinfo(uv_getaddrinfo_t* addrinfo, int result, s
 	}
 	else
 	{
-		tf_printf("getaddrinfo => %s\n", uv_strerror(result));
+		tf_printf("getaddrinfo(%s) => %s\n", connect->host, uv_strerror(result));
 	}
 	tf_free(connect);
 	uv_freeaddrinfo(info);

src/ssb.connections.c

@@ -4,8 +4,8 @@
 #include "mem.h"
 #include "ssb.h"
 
-#include <uv.h>
-#include <sqlite3.h>
+#include "uv.h"
+#include "sqlite3.h"
 
 #include <string.h>
 

src/ssb.db.c

@@ -6,12 +6,13 @@
 #include "trace.h"
 #include "util.js.h"
 
-#include <sodium/crypto_hash_sha256.h>
-#include <sodium/crypto_scalarmult.h>
-#include <sodium/crypto_scalarmult_curve25519.h>
-#include <sodium/crypto_secretbox.h>
-#include <sodium/crypto_sign.h>
-#include <sqlite3.h>
+#include "sodium/crypto_hash_sha256.h"
+#include "sodium/crypto_scalarmult.h"
+#include "sodium/crypto_scalarmult_curve25519.h"
+#include "sodium/crypto_secretbox.h"
+#include "sodium/crypto_sign.h"
+#include "sqlite3.h"
+
 #include <stdlib.h>
 #include <string.h>
 

src/ssb.db.h

@@ -2,7 +2,8 @@
 
 #include "ssb.h"
 
-#include <quickjs.h>
+#include "quickjs.h"
+
 #include <stdbool.h>
 
 typedef struct _tf_ssb_t tf_ssb_t;

src/ssb.export.c

@@ -5,10 +5,11 @@
 #include "ssb.db.h"
 #include "ssb.h"
 
+#include "sqlite3.h"
+#include "uv.h"
+
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
-#include <uv.h>
 
 static void _write_file(const char* path, const void* blob, size_t size)
 {

src/ssb.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <quickjs.h>
+#include "quickjs.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

src/ssb.import.c

@@ -6,13 +6,14 @@
 #include "ssb.h"
 #include "util.js.h"
 
-#include <quickjs.h>
+#include "quickjs.h"
+#include "sqlite3.h"
+#include "unzip.h"
+#include "uv.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sqlite3.h>
-#include <unzip.h>
-#include <uv.h>
 
 static void _tf_ssb_import_add_app(tf_ssb_t* ssb, const char* user, const char* app)
 {

src/ssb.js.c

@@ -7,16 +7,16 @@
 #include "ssb.h"
 #include "util.js.h"
 
-#include <sodium/crypto_hash_sha256.h>
-#include <sodium/crypto_box.h>
-#include <sodium/crypto_scalarmult.h>
-#include <sodium/crypto_scalarmult_curve25519.h>
-#include <sodium/crypto_secretbox.h>
-#include <sodium/crypto_sign.h>
-#include <sodium/randombytes.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <uv.h>
+#include "sodium/crypto_hash_sha256.h"
+#include "sodium/crypto_box.h"
+#include "sodium/crypto_scalarmult.h"
+#include "sodium/crypto_scalarmult_curve25519.h"
+#include "sodium/crypto_secretbox.h"
+#include "sodium/crypto_sign.h"
+#include "sodium/randombytes.h"
+#include "string.h"
+#include "sqlite3.h"
+#include "uv.h"
 
 #include <assert.h>
 #include <inttypes.h>

src/ssb.js.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "quickjs.h"
-
+typedef struct JSContext JSContext;
 typedef struct _tf_ssb_t tf_ssb_t;
 
 void tf_ssb_register(JSContext* context, tf_ssb_t* ssb);

src/ssb.rpc.c

@@ -5,7 +5,7 @@
 #include "ssb.db.h"
 #include "util.js.h"
 
-#include <sqlite3.h>
+#include "sqlite3.h"
 
 #include <inttypes.h>
 #include <string.h>

src/ssb.tests.c

@@ -7,12 +7,13 @@
 #include "tests.h"
 #include "util.js.h"
 
+#include "sqlite3.h"
+#include "uv.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
 #include <time.h>
-#include <uv.h>
 
 void tf_ssb_test_id_conversion(const tf_test_options_t* options)
 {

src/task.c

@@ -15,24 +15,21 @@
 #include "trace.h"
 #include "util.js.h"
 
+#include "backtrace.h"
+#include "quickjs.h"
+#include "sqlite3.h"
+#include "unzip.h"
+#include "uv.h"
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #include <assert.h>
 #include <malloc.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <uv.h>
-
-#include <sqlite3.h>
-
-#include "unzip.h"
-
-#include "quickjs.h"
-
-#include <backtrace.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
 
 #if !defined(_countof)
 #define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))

src/taskstub.js.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include "quickjs.h"
-
-#include <uv.h>
+#include "uv.h"
 
 typedef int taskid_t;
 

src/trace.c

@@ -6,6 +6,9 @@
 
 #include "mem.h"
 
+#include "sqlite3.h"
+#include "uv.h"
+
 #include <assert.h>
 #include <pthread.h>
 #include <stdio.h>
@@ -13,10 +16,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <pthread.h>
-#include <sqlite3.h>
-#include <uv.h>
-
 #if !defined(_countof)
 #define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
 #endif

src/util.js.c

@@ -5,12 +5,12 @@
 #include "task.h"
 #include "trace.h"
 
-#include <backtrace.h>
-#include <openssl/crypto.h>
-#include <openssl/sha.h>
-#include <picohttpparser.h>
-#include <sodium/utils.h>
-#include <uv.h>
+#include "backtrace.h"
+#include "openssl/crypto.h"
+#include "openssl/sha.h"
+#include "picohttpparser.h"
+#include "sodium/utils.h"
+#include "uv.h"
 
 #include <string.h>