Index: cvsapi/SqlConnection.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/SqlConnection.cpp,v retrieving revision 1.1.2.18.4.3.2.2 diff -c -r1.1.2.18.4.3.2.2 SqlConnection.cpp *** cvsapi/SqlConnection.cpp 10 May 2010 07:56:49 -0000 1.1.2.18.4.3.2.2 --- cvsapi/SqlConnection.cpp 15 Nov 2018 23:29:23 -0000 *************** *** 110,137 **** { CServerIo::trace(3,"Connecting to SQLite"); if(!la.Load("sqlite"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("SQLite_Alloc"); } if (!strcasecmp(db,"mysql")) { CServerIo::trace(3,"Connecting to MySql"); if(!la.Load("mysql"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("MySql_Alloc"); } if (!strcasecmp(db,"postgres")) { CServerIo::trace(3,"Connecting to Postgres"); if(!la.Load("postgres"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Postgres_Alloc"); } if (!strcasecmp(db,"odbc")) { CServerIo::trace(3,"Connecting to Odbc"); if(!la.Load("odbc"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Odbc_Alloc"); } if (!strcasecmp(db,"mssql")) --- 110,137 ---- { CServerIo::trace(3,"Connecting to SQLite"); if(!la.Load("sqlite"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("SQLite_Alloc"); } if (!strcasecmp(db,"mysql")) { CServerIo::trace(3,"Connecting to MySql"); if(!la.Load("mysql"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("MySql_Alloc"); } if (!strcasecmp(db,"postgres")) { CServerIo::trace(3,"Connecting to Postgres"); if(!la.Load("postgres"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Postgres_Alloc"); } if (!strcasecmp(db,"odbc")) { CServerIo::trace(3,"Connecting to Odbc"); if(!la.Load("odbc"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Odbc_Alloc"); } if (!strcasecmp(db,"mssql")) *************** *** 142,162 **** { CServerIo::trace(3,"Connecting to Firebird"); if(!la.Load("firebird"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Firebird_Alloc"); } if (!strcasecmp(db,"db2")) { CServerIo::trace(3,"Connecting to DB2"); if(!la.Load("db2"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Db2_Alloc"); } if (!strcasecmp(db,"oracle")) { CServerIo::trace(3,"Connecting to Oracle"); if(!la.Load("oracle"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Oracle_Alloc"); } if(!pNewSqlConnection) --- 142,162 ---- { CServerIo::trace(3,"Connecting to Firebird"); if(!la.Load("firebird"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Firebird_Alloc"); } if (!strcasecmp(db,"db2")) { CServerIo::trace(3,"Connecting to DB2"); if(!la.Load("db2"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Db2_Alloc"); } if (!strcasecmp(db,"oracle")) { CServerIo::trace(3,"Connecting to Oracle"); if(!la.Load("oracle"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewSqlConnection = (CSqlConnection*(*)())la.GetProc("Oracle_Alloc"); } if(!pNewSqlConnection) Index: cvsapi/mdns.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/mdns.cpp,v retrieving revision 1.1.2.4 diff -c -r1.1.2.4 mdns.cpp *** cvsapi/mdns.cpp 27 Jun 2006 12:25:20 -0000 1.1.2.4 --- cvsapi/mdns.cpp 15 Nov 2018 23:27:12 -0000 *************** *** 63,81 **** case mdnsMini: CServerIo::trace(3,"Loading miniMdns"); if(!la.Load("mini"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperMini_Alloc"); break; case mdnsHowl: CServerIo::trace(3,"Loading Howl mdns"); if(!la.Load("howl"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperHowl_Alloc"); break; case mdnsApple: CServerIo::trace(3,"Loading Apple mdns"); if(!la.Load("apple"SHARED_LIBRARY_EXTENSION,dir)) ! return false; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperApple_Alloc"); break; default: --- 63,81 ---- case mdnsMini: CServerIo::trace(3,"Loading miniMdns"); if(!la.Load("mini"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperMini_Alloc"); break; case mdnsHowl: CServerIo::trace(3,"Loading Howl mdns"); if(!la.Load("howl"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperHowl_Alloc"); break; case mdnsApple: CServerIo::trace(3,"Loading Apple mdns"); if(!la.Load("apple"SHARED_LIBRARY_EXTENSION,dir)) ! return NULL; pNewMdnsHelper = (CMdnsHelperBase*(*)())la.GetProc("MdnsHelperApple_Alloc"); break; default: Index: diff/analyze.c =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/analyze.c,v retrieving revision 1.10.2.1.12.6.4.1 diff -c -r1.10.2.1.12.6.4.1 analyze.c *** diff/analyze.c 22 Jun 2016 08:10:02 -0000 1.10.2.1.12.6.4.1 --- diff/analyze.c 16 Nov 2018 03:02:50 -0000 *************** *** 278,284 **** fxybest = -1; for (d = fmax; d >= fmin; d -= 2) { ! int x = min (fd[d], xlim); int y = x - d; if (ylim < y) x = ylim + d, y = ylim; --- 278,284 ---- fxybest = -1; for (d = fmax; d >= fmin; d -= 2) { ! int x = __min (fd[d], xlim); int y = x - d; if (ylim < y) x = ylim + d, y = ylim; *************** *** 293,299 **** bxybest = INT_MAX; for (d = bmax; d >= bmin; d -= 2) { ! int x = max (xoff, bd[d]); int y = x - d; if (y < yoff) x = yoff + d, y = yoff; --- 293,299 ---- bxybest = INT_MAX; for (d = bmax; d >= bmin; d -= 2) { ! int x = __max (xoff, bd[d]); int y = x - d; if (y < yoff) x = yoff + d, y = yoff; *************** *** 980,986 **** for (i = filevec[0].nondiscarded_lines + filevec[1].nondiscarded_lines; i != 0; i >>= 2) too_expensive <<= 1; ! too_expensive = max (256, too_expensive); files[0] = filevec[0]; files[1] = filevec[1]; --- 980,986 ---- for (i = filevec[0].nondiscarded_lines + filevec[1].nondiscarded_lines; i != 0; i >>= 2) too_expensive <<= 1; ! too_expensive = __max (256, too_expensive); files[0] = filevec[0]; files[1] = filevec[1]; Index: diff/context.c =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/context.c,v retrieving revision 1.5.2.3 diff -c -r1.5.2.3 context.c *** diff/context.c 14 Oct 2004 19:27:21 -0000 1.5.2.3 --- diff/context.c 16 Nov 2018 03:01:38 -0000 *************** *** 148,157 **** /* Include a context's width before and after. */ i = - files[0].prefix_lines; ! first0 = max (first0 - context, i); ! first1 = max (first1 - context, i); ! last0 = min (last0 + context, files[0].valid_lines - 1); ! last1 = min (last1 + context, files[1].valid_lines - 1); /* If desired, find the preceding function definition line in file 0. */ function = 0; --- 148,157 ---- /* Include a context's width before and after. */ i = - files[0].prefix_lines; ! first0 = __max (first0 - context, i); ! first1 = __max (first1 - context, i); ! last0 = __min (last0 + context, files[0].valid_lines - 1); ! last1 = __min (last1 + context, files[1].valid_lines - 1); /* If desired, find the preceding function definition line in file 0. */ function = 0; *************** *** 167,173 **** if (function) { printf_output (" "); ! write_output (function, min (function_length - 1, 40)); } printf_output ("\n*** "); --- 167,173 ---- if (function) { printf_output (" "); ! write_output (function, __min (function_length - 1, 40)); } printf_output ("\n*** "); *************** *** 279,288 **** /* Include a context's width before and after. */ i = - files[0].prefix_lines; ! first0 = max (first0 - context, i); ! first1 = max (first1 - context, i); ! last0 = min (last0 + context, files[0].valid_lines - 1); ! last1 = min (last1 + context, files[1].valid_lines - 1); /* If desired, find the preceding function definition line in file 0. */ function = 0; --- 279,288 ---- /* Include a context's width before and after. */ i = - files[0].prefix_lines; ! first0 = __max (first0 - context, i); ! first1 = __max (first1 - context, i); ! last0 = __min (last0 + context, files[0].valid_lines - 1); ! last1 = __min (last1 + context, files[1].valid_lines - 1); /* If desired, find the preceding function definition line in file 0. */ function = 0; *************** *** 303,309 **** if (function) { write_output (" ", 1); ! write_output (function, min (function_length - 1, 40)); } write_output ("\n", 1); --- 303,309 ---- if (function) { write_output (" ", 1); ! write_output (function, __min (function_length - 1, 40)); } write_output ("\n", 1); Index: diff/diff.c =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/diff.c,v retrieving revision 1.14.2.24.8.9.4.1 diff -c -r1.14.2.24.8.9.4.1 diff.c *** diff/diff.c 22 Jun 2016 08:10:02 -0000 1.14.2.24.8.9.4.1 --- diff/diff.c 16 Nov 2018 02:56:19 -0000 *************** *** 652,658 **** */ int t = tab_expand_flag ? 1 : TAB_WIDTH; int off = (width + t + GUTTER_WIDTH_MINIMUM) / (2*t) * t; ! sdiff_half_width = max (0, min (off - GUTTER_WIDTH_MINIMUM, width - off)), sdiff_column2_offset = sdiff_half_width ? off : width; } --- 652,658 ---- */ int t = tab_expand_flag ? 1 : TAB_WIDTH; int off = (width + t + GUTTER_WIDTH_MINIMUM) / (2*t) * t; ! sdiff_half_width = __max (0, __min (off - GUTTER_WIDTH_MINIMUM, width - off)), sdiff_column2_offset = sdiff_half_width ? off : width; } Index: diff/diff3.c =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/diff3.c,v retrieving revision 1.11.2.12.8.9 diff -c -r1.11.2.12.8.9 diff3.c *** diff/diff3.c 2 Jun 2008 12:35:27 -0000 1.11.2.12.8.9 --- diff/diff3.c 16 Nov 2018 03:00:50 -0000 *************** *** 521,528 **** if (thread1) for (i = 0; i < 2; i++) { ! horizon_lines = max (horizon_lines, D_NUMLINES (thread1, i)); ! horizon_lines = max (horizon_lines, D_NUMLINES (last_block, i)); } */ DTRACE(3, "diff3() - call process_diff - thread0"); --- 521,528 ---- if (thread1) for (i = 0; i < 2; i++) { ! horizon_lines = __max (horizon_lines, D_NUMLINES (thread1, i)); ! horizon_lines = __max (horizon_lines, D_NUMLINES (last_block, i)); } */ DTRACE(3, "diff3() - call process_diff - thread0"); *************** *** 1439,1445 **** DTRACE(3, "read_diff() - opened temporary diff file \"%s\"",diffout); current_chunk_size = 8 * 1024; if (fstat (fd, &pipestat) == 0) ! current_chunk_size = max (current_chunk_size, STAT_BLOCKSIZE (pipestat)); diff_result = xdmalloc (current_chunk_size); DTRACE(3, "read_diff() - allocated %d bytes for diff_result",(int)current_chunk_size); --- 1439,1445 ---- DTRACE(3, "read_diff() - opened temporary diff file \"%s\"",diffout); current_chunk_size = 8 * 1024; if (fstat (fd, &pipestat) == 0) ! current_chunk_size = __max (current_chunk_size, STAT_BLOCKSIZE (pipestat)); diff_result = xdmalloc (current_chunk_size); DTRACE(3, "read_diff() - allocated %d bytes for diff_result",(int)current_chunk_size); Index: diff/dir.c =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/dir.c,v retrieving revision 1.7.2.2.12.3 diff -c -r1.7.2.2.12.3 dir.c *** diff/dir.c 2 Jun 2008 12:35:27 -0000 1.7.2.2.12.3 --- diff/dir.c 16 Nov 2018 03:01:57 -0000 *************** *** 63,69 **** /* Initialize the table of filenames. */ ! data_alloc = max (1, (size_t) dir->stat.st_size); data_used = 0; dirdata->data = data = xdmalloc (data_alloc); --- 63,69 ---- /* Initialize the table of filenames. */ ! data_alloc = __max (1, (size_t) dir->stat.st_size); data_used = 0; dirdata->data = data = xdmalloc (data_alloc); Index: diff/system.h =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/system.h,v retrieving revision 1.7.2.8 diff -c -r1.7.2.8 system.h *** diff/system.h 29 Jul 2005 20:55:57 -0000 1.7.2.8 --- diff/system.h 16 Nov 2018 02:55:49 -0000 *************** *** 205,212 **** #ifdef max #undef max #endif ! #define min(a,b) ((a) <= (b) ? (a) : (b)) ! #define max(a,b) ((a) >= (b) ? (a) : (b)) /* This section contains Posix-compliant defaults for macros that are meant to be overridden by hand in config.h as needed. */ --- 205,212 ---- #ifdef max #undef max #endif ! #define __min(a,b) ((a) <= (b) ? (a) : (b)) ! #define __max(a,b) ((a) >= (b) ? (a) : (b)) /* This section contains Posix-compliant defaults for macros that are meant to be overridden by hand in config.h as needed. */