Skip to content

Commit

Permalink
Merge pull request hufrea#10 from lufog/asan
Browse files Browse the repository at this point in the history
Fix build with LLVM-MinGW
  • Loading branch information
hufrea authored May 2, 2024
2 parents 1159678 + 7fb9164 commit f0dab7d
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion conev.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define CONEV_H
#include <conev.h>
#include "conev.h"

#include <stdlib.h>
#include <string.h>
Expand Down
6 changes: 3 additions & 3 deletions desync.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#endif
#define STR_MODE

#include <params.h>
#include <packets.h>
#include <error.h>
#include "params.h"
#include "packets.h"
#include "error.h"


static inline int get_family(struct sockaddr *dst)
Expand Down
4 changes: 2 additions & 2 deletions error.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#endif
#endif

inline const int unie(int e)
static inline const int unie(int e)
{
#ifdef _WIN32
switch (e) {
Expand Down Expand Up @@ -64,4 +64,4 @@ inline const int unie(int e)
#define LOG(s, str, ...) \
if (params.debug >= s) \
fprintf(stderr, str, ##__VA_ARGS__)
#endif
#endif
6 changes: 3 additions & 3 deletions extend.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

#include <string.h>

#include <proxy.h>
#include <error.h>
#include <params.h>
#include "proxy.h"
#include "error.h"
#include "params.h"

#include <desync.h>
#include <packets.h>
Expand Down
8 changes: 4 additions & 4 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#include <getopt.h>
#include <limits.h>

#include <params.h>
#include <proxy.h>
#include <packets.h>
#include <error.h>
#include "params.h"
#include "proxy.h"
#include "packets.h"
#include "error.h"

#ifndef _WIN32
#include <arpa/inet.h>
Expand Down
2 changes: 1 addition & 1 deletion mpool.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <mpool.h>
#include "mpool.h"


static inline int scmp(const struct elem *p, const struct elem *q)
Expand Down
2 changes: 1 addition & 1 deletion params.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <stdio.h>
#include <mpool.h>
#include "mpool.h"

#ifdef _WIN32
#include <ws2tcpip.h>
Expand Down
10 changes: 5 additions & 5 deletions proxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <string.h>
#include <signal.h>

#include <proxy.h>
#include <params.h>
#include <conev.h>
#include <extend.h>
#include <error.h>
#include "proxy.h"
#include "params.h"
#include "conev.h"
#include "extend.h"
#include "error.h"

#ifdef _WIN32
#include <winsock2.h>
Expand Down
2 changes: 1 addition & 1 deletion proxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <arpa/inet.h>
#endif

#include <conev.h>
#include "conev.h"

struct sockaddr_ina {
union {
Expand Down

0 comments on commit f0dab7d

Please sign in to comment.