c940f23ae50c5ba3c014916eb3114571a7017d68 angie Mon Sep 9 09:41:40 2013 -0700 Fixing linker warnings that appear on Mac OS X 10.8, caused byarguments passed to functions that don't take any arguments. diff --git src/hg/hgTables/compositeTrack.c src/hg/hgTables/compositeTrack.c index 4753dd6..fa9dd40 100644 --- src/hg/hgTables/compositeTrack.c +++ src/hg/hgTables/compositeTrack.c @@ -158,31 +158,31 @@ curTrack->table, curTrack->longLabel); hPrintf("<FORM ACTION=\"../cgi-bin/hgTables\" NAME=\"mainForm\" METHOD=%s>\n", cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); /* Currently selected subtrack table will be the primary subtrack in the * merge. */ cgiMakeHiddenVar(hgtaNextSubtrackMergePrimary, dbTable); hPrintf("<H3>Select a subset of subtracks to merge:</H3>\n"); hCompositeUi(database, cart, curTrack, curTable, hgtaDoSubtrackMergePage, "mainForm"); hPrintf("<H3>Select a merge operation:</H3>\n"); struct trackDb *primary = subTdbFind(curTrack,curTable); if (isWiggle(database, curTable) || isBedGraph(curTable) || isBigWigTable(curTable)) - showWiggleMergeOptions(primary->longLabel); + showWiggleMergeOptions(); else showBedMergeOptions(); hPrintf("If a filter is specified on the main Table Browser page, it will " "be applied only to %s, not to any other selected subtrack. ", primary->longLabel); hPrintf("If an intersection is specified on the main page, it will be applied " "to the result of this merge.<P>\n"); hPrintf("<P>\n"); cgiMakeButton(hgtaDoSubtrackMergeSubmit, "submit"); hPrintf(" "); cgiMakeButton(hgtaDoMainPage, "cancel"); hPrintf("</FORM>\n"); htmlClose(); }