diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-30 22:31:39 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-30 22:36:15 (GMT) |
| commit | f97990fedd034e013d27bfb83a6196ab0d4c9a66 (patch) | |
| tree | a3550252ba2f47f62e48f6f3ac82fe13f7a63fb1 /includes | |
| parent | 5d34cae2e48938aaeebb44786e164bc3c7d94a43 (diff) | |
| parent | bcbcb0063b1f3451b4e329b69d275bcabadc788a (diff) | |
| download | powder-f97990fedd034e013d27bfb83a6196ab0d4c9a66.zip powder-f97990fedd034e013d27bfb83a6196ab0d4c9a66.tar.gz | |
Merge branch 'upstream' into dev
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 1 | ||||
| -rwxr-xr-x | includes/http.h | 6 | ||||
| -rw-r--r-- | includes/interface.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/includes/defines.h b/includes/defines.h index b6df689..2057fe0 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -139,6 +139,7 @@ int gol[XRES][YRES]; int gol2[XRES][YRES][NGOL+1]; int SEC; int SEC2; +int console_mode; int REPLACE_MODE; int CURRENT_BRUSH; int GRID_MODE; diff --git a/includes/http.h b/includes/http.h index 2ad7ccc..af0971c 100755 --- a/includes/http.h +++ b/includes/http.h @@ -24,10 +24,10 @@ void http_init(char *proxy); void http_done(void); char *http_simple_get(char *uri, int *ret, int *len); -char *http_auth_get(char *uri, char *user, char *pass, int *ret, int *len); +char *http_auth_get(char *uri, char *user, char *pass, char * session_id, int *ret, int *len); char *http_simple_post(char *uri, char *data, int dlen, int *ret, int *len); -void http_auth_headers(void *ctx, char *user, char *pass); +void http_auth_headers(void *ctx, char *user, char *pass, char * session_id); void *http_async_req_start(void *ctx, char *uri, char *data, int dlen, int keep); void http_async_add_header(void *ctx, char *name, char *data); @@ -36,7 +36,7 @@ void http_async_get_length(void *ctx, int *total, int *done); char *http_async_req_stop(void *ctx, int *ret, int *len); void http_async_req_close(void *ctx); -char *http_multipart_post(char *uri, char **names, char **parts, int *plens, char *user, char *pass, int *ret, int *len); +char *http_multipart_post(char *uri, char **names, char **parts, int *plens, char *user, char *pass, char * session_id, int *ret, int *len); char *http_ret_text(int ret); diff --git a/includes/interface.h b/includes/interface.h index 4bee583..de1c955 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -118,6 +118,8 @@ extern int svf_admin; extern int svf_mod; extern char svf_user[64]; extern char svf_pass[64]; +extern char svf_user_id[64]; +extern char svf_session_id[64]; extern int svf_open; extern int svf_own; @@ -224,5 +226,7 @@ void open_link(char *uri); int report_ui(pixel *vid_buf, char *save_id); +char *console_ui(pixel *vid_buf, char error[255]); + #endif |