From fef145fbbcd387fa4c19e12a5b057d128668804d Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 30 Oct 2006 18:38:42 +0000 Subject: [PATCH] is required under all Unix flavors, too; is required under at least Linux and Solaris --- cvstrac/cvstrac.patch | 62 ++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/cvstrac/cvstrac.patch b/cvstrac/cvstrac.patch index fbcfe6296e..12555ad342 100644 --- a/cvstrac/cvstrac.patch +++ b/cvstrac/cvstrac.patch @@ -1,6 +1,6 @@ Index: attach.c --- attach.c.orig 2006-05-26 16:20:28 +0200 -+++ attach.c 2006-10-30 19:23:34 +0100 ++++ attach.c 2006-10-30 19:37:02 +0100 @@ -210,17 +210,20 @@ } @@ -35,7 +35,7 @@ Index: attach.c if( !got ){ Index: browse.c --- browse.c.orig 2006-05-26 16:20:28 +0200 -+++ browse.c 2006-10-30 19:23:34 +0100 ++++ browse.c 2006-10-30 19:37:02 +0100 @@ -503,6 +503,13 @@ ){ int set = (zFld==zField[0]); @@ -180,7 +180,7 @@ Index: browse.c } Index: cgi.c --- cgi.c.orig 2006-05-26 16:20:28 +0200 -+++ cgi.c 2006-10-30 19:23:34 +0100 ++++ cgi.c 2006-10-30 19:37:02 +0100 @@ -187,7 +187,7 @@ char zETag[64]; @@ -219,7 +219,7 @@ Index: cgi.c if( zData==0 ) return 0; Index: common.c --- common.c.orig 2006-05-26 16:20:28 +0200 -+++ common.c 2006-10-30 19:23:34 +0100 ++++ common.c 2006-10-30 19:37:02 +0100 @@ -394,7 +394,10 @@ } @ @@ -232,9 +232,22 @@ Index: common.c @ @ Not logged in } +Index: config.h +--- config.h.orig 2006-05-26 16:20:28 +0200 ++++ config.h 2006-10-30 19:37:02 +0100 +@@ -9,6 +9,9 @@ + #include + #include + #include ++#if defined(__linux__) || defined(__sun__) ++#include ++#endif + + /* + ** Standard colors. These colors can also be changed using a stylesheet. Index: cvs.c --- cvs.c.orig 2006-05-26 16:20:28 +0200 -+++ cvs.c 2006-10-30 19:26:08 +0100 ++++ cvs.c 2006-10-30 19:37:02 +0100 @@ -234,6 +234,7 @@ char **azFileList; FILE *in; @@ -255,7 +268,7 @@ Index: cvs.c Index: db.c --- db.c.orig 2006-05-26 16:20:28 +0200 -+++ db.c 2006-10-30 19:23:34 +0100 ++++ db.c 2006-10-30 19:37:02 +0100 @@ -107,6 +107,10 @@ extern int sqlite3StrICmp(const char*, const char*); if( type==SQLITE_SELECT ){ @@ -311,7 +324,7 @@ Index: db.c db_err( strerror(errno), 0, Index: format.c --- format.c.orig 2006-05-26 16:20:28 +0200 -+++ format.c 2006-10-30 19:23:34 +0100 ++++ format.c 2006-10-30 19:37:02 +0100 @@ -760,7 +760,7 @@ if( az && az[0] && az[1] ){ cgi_printf("",zLink,az[0]); @@ -323,7 +336,7 @@ Index: format.c cgi_printf("#%d",tn); Index: login.c --- login.c.orig 2006-05-26 16:20:28 +0200 -+++ login.c 2006-10-30 19:23:34 +0100 ++++ login.c 2006-10-30 19:37:02 +0100 @@ -55,8 +55,8 @@ zGoto = P("g"); if( P("out")!=0 ){ @@ -356,8 +369,19 @@ Index: login.c zAgent = getenv("HTTP_USER_AGENT"); Index: makeheaders.c --- makeheaders.c.orig 2006-05-26 16:20:28 +0200 -+++ makeheaders.c 2006-10-30 19:23:34 +0100 -@@ -2137,7 +2137,7 @@ ++++ makeheaders.c 2006-10-30 19:37:02 +0100 +@@ -11,9 +11,8 @@ + #include + #ifndef WIN32 + # include +-#else +-# include + #endif ++#include + + /* + ** Macros for debugging. +@@ -2137,7 +2136,7 @@ zArg++; } if( *zArg==0 || *zArg=='\n' ){ return 0; } @@ -366,7 +390,7 @@ Index: makeheaders.c if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){ PushIfMacro(0,0,0,pToken->nLine,PS_Interface); }else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){ -@@ -2156,7 +2156,7 @@ +@@ -2156,7 +2155,7 @@ zArg++; } if( *zArg==0 || *zArg=='\n' ){ return 0; } @@ -375,7 +399,7 @@ Index: makeheaders.c PushIfMacro("defined",zArg,nArg,pToken->nLine,0); }else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){ /* -@@ -2167,7 +2167,7 @@ +@@ -2167,7 +2166,7 @@ zArg++; } if( *zArg==0 || *zArg=='\n' ){ return 0; } @@ -384,7 +408,7 @@ Index: makeheaders.c PushIfMacro("!defined",zArg,nArg,pToken->nLine,0); }else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){ /* -@@ -2793,7 +2793,7 @@ +@@ -2793,7 +2792,7 @@ fprintf(stderr, "%s: Can't overwrite this file because it wasn't previously\n" "%*s generated by 'makeheaders'.\n", @@ -393,7 +417,7 @@ Index: makeheaders.c nErr++; }else if( strcmp(zOldVersion,zNewVersion)!=0 ){ if( report ) fprintf(report,"updated\n"); -@@ -2952,10 +2952,10 @@ +@@ -2952,10 +2951,10 @@ pDecl->zName, zLabel, pDecl->zFile, @@ -409,7 +433,7 @@ Index: makeheaders.c ); Index: search.c --- search.c.orig 2006-05-26 16:20:28 +0200 -+++ search.c 2006-10-30 19:23:34 +0100 ++++ search.c 2006-10-30 19:37:02 +0100 @@ -88,7 +88,7 @@ const char *zPattern; @@ -439,7 +463,7 @@ Index: search.c /* Index: setup.c --- setup.c.orig 2006-05-26 16:20:28 +0200 -+++ setup.c 2006-10-30 19:23:34 +0100 ++++ setup.c 2006-10-30 19:37:02 +0100 @@ -499,7 +499,7 @@ @
@ Select a user to whom new tickets will be assigned by default:

@@ -451,7 +475,7 @@ Index: setup.c @ Index: throttle.c --- throttle.c.orig 2006-05-26 16:20:28 +0200 -+++ throttle.c 2006-10-30 19:23:34 +0100 ++++ throttle.c 2006-10-30 19:37:02 +0100 @@ -165,7 +165,7 @@ } @@ -463,7 +487,7 @@ Index: throttle.c lockout(); Index: ticket.c --- ticket.c.orig 2006-05-26 16:20:28 +0200 -+++ ticket.c 2006-10-30 19:23:34 +0100 ++++ ticket.c 2006-10-30 19:37:02 +0100 @@ -388,7 +388,7 @@ @ @ @@ -513,7 +537,7 @@ Index: ticket.c doSubmit = P("submit")!=0; Index: timeline.c --- timeline.c.orig 2006-05-26 16:20:28 +0200 -+++ timeline.c 2006-10-30 19:23:34 +0100 ++++ timeline.c 2006-10-30 19:37:02 +0100 @@ -1105,6 +1105,9 @@ z = db_short_query("SELECT date FROM chng WHERE cn=%d",cn); if( z ) cgi_modified_since(atoi(z));