cd0d3f081ff261f36b65ec1016d859ce3d50cb14 chmalee Mon Apr 19 14:29:28 2021 -0700 Add -fno-common to library makefiles to fix common extern variable definition errors diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index 851766f..dc7ed26 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -229,31 +229,30 @@ #include "wikiTrack.h" #include "grp.h" #include "omicia.h" #include "atomDb.h" #include "pcrResult.h" #include "twoBit.h" #include "itemConf.h" #include "chromInfo.h" #include "gbWarn.h" #include "lsSnpPdbChimera.h" #include "mammalPsg.h" #include "net.h" #include "jsHelper.h" #include "virusClick.h" #include "gwasCatalog.h" -#include "parClick.h" #include "mdb.h" #include "yaleGencodeAssoc.h" #include "itemDetailsHtml.h" #include "trackVersion.h" #include "numtsClick.h" #include "geneReviewsClick.h" #include "bigBed.h" #include "bigPsl.h" #include "bedTabix.h" #include "longRange.h" #include "hmmstats.h" #include "aveStats.h" #include "trix.h" #include "bPlusTree.h" #include "customFactory.h" @@ -19025,31 +19024,31 @@ char **row = NULL; if ((row = sqlNextRow(sr)) != NULL) { int mupitPosition = start + 1; // mupit uses 1-based coords printf("<TR><TD colspan=2><B>"); if (sameString(database, "hg19")) printf("<A HREF=\"http://hg19.cravat.us/MuPIT_Interactive/?gm=%s:%d\">", seqName, mupitPosition); else if (sameString(database, "hg38")) printf("<A HREF=\"http://mupit.icm.jhu.edu/MuPIT_Interactive/?gm=%s:%d\">", seqName, mupitPosition); printf("MuPIT Structure</A></B></TD></TR>\n"); } } } void printOtherSnpMappings(char *table, char *name, int start, - struct sqlConnection *conn, int rowOffset) + struct sqlConnection *conn, int rowOffset, struct trackDb *tdb) /* If this SNP (from any bed4+ table) is not uniquely mapped, print the other mappings. */ { char query[512]; sqlSafef(query, sizeof(query), "select * from %s where name='%s'", table, name); struct sqlResult *sr = sqlGetResult(conn, query); int snpCount = 0; char **row; while ((row = sqlNextRow(sr)) != NULL) { struct bed *snp = bedLoad3(row + rowOffset); if (snp->chromStart != start || differentString(snp->chrom, seqName)) { printf("<BR>\n"); if (snpCount == 0) @@ -19084,31 +19083,31 @@ if (version >= 132) snp = snp132ExtLoad(row+rowOffset); else snp = (struct snp132Ext *)snp125Load(row+rowOffset); printCustomUrl(tdb, itemName, FALSE); bedPrintPos((struct bed *)snp, 3, tdb); snpAlign = snp125ToSnp((struct snp125 *)snp); printf("<BR>\n"); printSnp125Info(tdb, snp, version); doSnpEntrezGeneLink(tdb, itemName); } else errAbort("SNP %s not found at %s base %d", itemName, seqName, start); sqlFreeResult(&sr); -printOtherSnpMappings(table, itemName, start, conn, rowOffset); +printOtherSnpMappings(table, itemName, start, conn, rowOffset, tdb); puts("<BR>"); // Make table for collapsible sections: puts("<TABLE>"); checkForGwasCatalog(conn, tdb, itemName); checkForHgdpGeo(conn, tdb, itemName, start); checkForHapmap(conn, tdb, itemName); checkForMupit(conn, tdb, start); printSnpAlignment(tdb, snpAlign, version); puts("</TABLE>"); printTrackHtml(tdb); hFreeConn(&conn); } void doTigrGeneIndex(struct trackDb *tdb, char *item)