--- parser3/src/include/pa_http.h 2012/03/16 09:24:09 1.7 +++ parser3/src/include/pa_http.h 2013/03/10 23:32:36 1.9 @@ -8,7 +8,7 @@ #ifndef PA_HTTP_H #define PA_HTTP_H -#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.7 2012/03/16 09:24:09 moko Exp $" +#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.9 2013/03/10 23:32:36 misha Exp $" #include "pa_vstring.h" #include "pa_vint.h" @@ -16,19 +16,16 @@ #include "pa_vtable.h" #include "pa_socks.h" -#ifdef CYGWIN -#define _GNU_H_WINDOWS32_SOCKETS -// for PASCAL +#ifdef WIN32 #include -// SOCKET -typedef u_int SOCKET; -int PASCAL closesocket(SOCKET); -#else -# if defined(WIN32) -# include -# else -# define closesocket close -# endif + +#ifdef CYGWIN +typedef u_int SOCKET; +extern "C" int PASCAL FAR closesocket(SOCKET); +#endif + +#else // WIN32 +#define closesocket close #endif #ifndef DOXYGEN @@ -38,6 +35,8 @@ struct File_read_http_result { }; #endif +Table* parse_cookies(Request& r, Table *cookies); + char *pa_http_safe_header_name(const char *name); File_read_http_result pa_internal_file_read_http(Request& r,