b58ba4822dba71c108aeefeaa92670e95b3551dc tdreszer Fri Jul 2 10:47:42 2010 -0700 Removed ifdefs which were past their expiration date diff --git src/lib/htmshell.c src/lib/htmshell.c index e75ff6e..5852517 100644 --- src/lib/htmshell.c +++ src/lib/htmshell.c @@ -199,7 +199,6 @@ return "<!-- HGERROR-END -->\n"; } -#ifdef WARNBOX_IN_USE void htmlWarnBoxSetup(FILE *f) /* Creates an invisible, empty warning box than can be filled with errors * and then made visible. */ @@ -241,14 +240,12 @@ "}\n"); // Note that the OK button goes to prev page when this page is interrupted by the error. fprintf(f,"</script>\n"); } -#endif//ifdef WARNBOX_IN_USE void htmlVaWarn(char *format, va_list args) /* Write an error message. */ { va_list argscp; va_copy(argscp, args); -#ifdef WARNBOX_IN_USE htmlWarnBoxSetup(stdout); // sets up the warnBox if it hasn't already been done. char warning[1024]; vsnprintf(warning,sizeof(warning),format, args); @@ -260,15 +257,6 @@ printf("<script type='text/javascript'>{showWarnBox();" "var warnList=document.getElementById('warnList');" "warnList.innerHTML += '<li>%s</li>';}</script><!-- ERROR -->\n",warning); // NOTE that "--ERROR --" is needed at the end of this print!! -#else//ifndef WARNBOX_IN_USE - -htmlHorizontalLine(); -printf("%s", htmlWarnStartPattern()); -htmlVaParagraph(format,args); -printf("%s", htmlWarnEndPattern()); -htmlHorizontalLine(); - -#endif//def WARNBOX_IN_USE /* Log useful CGI info to stderr */ logCgiToStderr(); @@ -412,9 +400,7 @@ fprintf(f, " BGCOLOR=\"%X\"", htmlBgColor); fputs(">\n",f); -#ifdef WARNBOX_IN_USE htmlWarnBoxSetup(f); -#endif//def WARNBOX_IN_USE } @@ -548,9 +534,7 @@ else printf("<BODY BACKGROUND=\"%s\">\n", htmlBackground); -#ifdef WARNBOX_IN_USE htmlWarnBoxSetup(stdout);// Sets up a warning box which can be filled with errors as they occur -#endif//def WARNBOX_IN_USE /* Call wrapper for error handling. */ htmEmptyShell(doMiddle, method);