Skip to content

Commit

Permalink
Merge pull request unbit#2284 from q3k/q3k/uwsgi-local-includes
Browse files Browse the repository at this point in the history
core, proto: replace uwsgi.h system includes
  • Loading branch information
xrmx authored Feb 1, 2021
2 parents d25c3fe + 4f8d9c2 commit 6947955
Show file tree
Hide file tree
Showing 48 changed files with 49 additions and 48 deletions.
2 changes: 1 addition & 1 deletion core/async.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/cache.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;
#define cache_item(x) (struct uwsgi_cache_item *) (((char *)uc->items) + ((sizeof(struct uwsgi_cache_item)+uc->keysize) * x))
Expand Down
2 changes: 1 addition & 1 deletion core/chunked.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/config.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/cookie.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/cron.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/daemons.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/emperor.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The uWSGI Emperor
*/
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;
extern char **environ;
Expand Down
2 changes: 1 addition & 1 deletion core/errors.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/exceptions.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/fifo.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/fork_server.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/fsmon.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/hash.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/hooks.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/ini.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
4 changes: 2 additions & 2 deletions core/logging.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __DragonFly__
#include <uwsgi.h>
#include "uwsgi.h"
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/user.h>
Expand All @@ -15,7 +15,7 @@
#endif

#ifdef __DragonFly__
#include <uwsgi.h>
#include "uwsgi.h"
#endif

extern struct uwsgi_server uwsgi;
Expand Down
2 changes: 1 addition & 1 deletion core/master_checks.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/master_events.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/metrics.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/mount.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/notify.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/plugins_builder.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

#define UWSGI_BUILD_DIR ".uwsgi_plugins_builder"

Expand Down
2 changes: 1 addition & 1 deletion core/progress.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/querystring.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/rb_timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
*/

#include <uwsgi.h>
#include "uwsgi.h"

#define uwsgi_rbt_red(node) ((node)->color = 1)
#define uwsgi_rbt_black(node) ((node)->color = 0)
Expand Down
2 changes: 1 addition & 1 deletion core/reader.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/routing.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef UWSGI_ROUTING
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/rpc.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/sharedarea.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/snmp.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/ssl.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"
#include <openssl/rand.h>
#include <openssl/sha.h>
#include <openssl/md5.h>
Expand Down
2 changes: 1 addition & 1 deletion core/strings.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

char *uwsgi_str_split_nget(char *str, size_t len, char what, size_t pos, size_t *rlen) {
size_t i;
Expand Down
2 changes: 1 addition & 1 deletion core/timebomb.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/transformations.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/utils.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"


extern struct uwsgi_server uwsgi;
Expand Down
2 changes: 1 addition & 1 deletion core/uwsgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/


#include <uwsgi.h>
#include "uwsgi.h"

struct uwsgi_server uwsgi;
pid_t masterpid;
Expand Down
2 changes: 1 addition & 1 deletion core/webdav.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion core/websockets.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/zeus.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion core/zlib.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

char gzheader[10] = { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };

Expand Down
1 change: 1 addition & 0 deletions proto/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exports_files(glob(["*.c"]))
2 changes: 1 addition & 1 deletion proto/base.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion proto/fastcgi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* async fastcgi protocol parser */

#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion proto/http.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* async http protocol parser */

#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion proto/puwsgi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* async uwsgi protocol parser */

#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion proto/scgi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* async SCGI protocol parser */

#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down
2 changes: 1 addition & 1 deletion proto/uwsgi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* async uwsgi protocol parser */

#include <uwsgi.h>
#include "uwsgi.h"

extern struct uwsgi_server uwsgi;

Expand Down

0 comments on commit 6947955

Please sign in to comment.