compiler updates

This commit is contained in:
Matt 2014-12-10 12:09:04 -08:00
parent d8ba619df3
commit 329f004e74
3 changed files with 7 additions and 5 deletions

View File

@ -163,7 +163,8 @@ gb: vclean $(OBJS) main.o $(LIBFILES)
$(CC) $(DEFS) $(CPPFLAGS) -o $@ main.o $(OBJS) $(LIBS)
# use this for compiling on CYGWIN: (only for 32bit cygwin right now and
# use this for compiling on CYGWIN:
# only for 32bit cygwin right now and
# you have to install the packages that have these libs.
# you have to get these packages from cygwin:
# 1. LIBS > zlib-devel: Gzip de/compression library (development)
@ -173,6 +174,7 @@ gb: vclean $(OBJS) main.o $(LIBFILES)
# 5. DEVEL > gcc-g++: GNU Compiler Collection (C++)
# 6. DEVEL > make: The GNU version of the 'make' utility
# 7. DEVEL > git: Distributed version control system
# 8. EDITORS > emacs
cygwin:
make DEFS="-DCYGWIN -D_REENTRANT_ $(CHECKFORMATSTRING) -I." LIBS=" -lz -lm -lpthread -lssl -lcrypto -liconv" gb

View File

@ -3010,7 +3010,7 @@ void stripProxyAuthorization ( char *squidProxiedReqBuf ) {
loop:
// include space so it won't match anything in url
char *needle = "Proxy-Authorization: ";
char *s = strcasestr ( squidProxiedReqBuf , needle );
char *s = gb_strcasestr ( squidProxiedReqBuf , needle );
if ( ! s ) return;
// find next \r\n
char *end = strstr ( s , "\r\n");

View File

@ -16990,7 +16990,7 @@ void *filterStartWrapper_r ( void *state , ThreadEntry *te ) {
// sets m_errno on error
void XmlDoc::filterStart_r ( bool amThread ) {
// get thread id
int32_t id = getpidtid();
pthread_t id = getpidtid();
// sanity check
if ( ! m_contentTypeValid ) { char *xx=NULL;*xx=0; }
// int16_tcut
@ -17004,11 +17004,11 @@ void XmlDoc::filterStart_r ( bool amThread ) {
// pass the input to the program through this file
// rather than a pipe, since popen() seems broken
char in[1024];
snprintf(in,1023,"%s/in.%"INT32"", g_hostdb.m_dir , id );
snprintf(in,1023,"%s/in.%"INT32"", g_hostdb.m_dir , (int32_t)id );
unlink ( in );
// collect the output from the filter from this file
char out[1024];
snprintf ( out , 1023,"%s/out.%"INT32"", g_hostdb.m_dir , id );
snprintf ( out , 1023,"%s/out.%"INT32"", g_hostdb.m_dir, (int32_t)id );
unlink ( out );
// ignore errno from those unlinks
errno = 0;