From a834b8647f369a99764a8de2b9dc07bbcd38df7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Apr 2008 21:53:49 +0000 Subject: avoid mmap struct member name, a #define on AIX git-svn-id: svn://tug.org/texlive/trunk@7754 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipng/color.c | 4 ++-- Build/source/texk/dvipng/dvipng.h | 2 +- Build/source/texk/dvipng/enc.c | 4 ++-- Build/source/texk/dvipng/fontmap.c | 4 ++-- Build/source/texk/dvipng/misc.c | 32 ++++++++++++++++---------------- Build/source/texk/dvipng/pk.c | 4 ++-- Build/source/texk/dvipng/sfd.c | 4 ++-- Build/source/texk/dvipng/tfm.c | 6 +++--- Build/source/texk/dvipng/vf.c | 6 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvipng/color.c b/Build/source/texk/dvipng/color.c index c4470bbacb5..b2539e6eb5c 100644 --- a/Build/source/texk/dvipng/color.c +++ b/Build/source/texk/dvipng/color.c @@ -102,8 +102,8 @@ struct colorname* LoadColornameFile(char* filename, bool should_exist) } DEBUG_PRINT(DEBUG_COLOR,("\n OPEN COLOR NAMES:\t'%s'", filepath)); if (MmapFile(filepath,&fmmap)) return NULL; - pos=fmmap.mmap; - max=fmmap.mmap+fmmap.size; + pos=fmmap.dp_mmap; + max=fmmap.dp_mmap+fmmap.size; while (posname=(char*)encp+sizeof(struct encoding); strcpy(encp->name,encoding); - pos=fmmap.mmap; - max=fmmap.mmap+fmmap.size; + pos=fmmap.dp_mmap; + max=fmmap.dp_mmap+fmmap.size; buf=encp->name+strlen(encoding)+1; #define SKIPCOMMENT(x) if (*x=='%') while (xmmap; - end=searching_mmap->mmap+searching_mmap->size; + pos=searching_mmap->dp_mmap; + end=searching_mmap->dp_mmap+searching_mmap->size; } while(postfmname,fontname)!=0)) { while(pos < end diff --git a/Build/source/texk/dvipng/misc.c b/Build/source/texk/dvipng/misc.c index 8bd0b60a414..fa544c37f8d 100644 --- a/Build/source/texk/dvipng/misc.c +++ b/Build/source/texk/dvipng/misc.c @@ -742,7 +742,7 @@ bool MmapFile (char *filename,struct filemmap *fmmap) #endif DEBUG_PRINT(DEBUG_DVI,("\n OPEN FILE:\t'%s'", filename)); - fmmap->mmap=NULL; + fmmap->dp_mmap=NULL; #ifndef MIKTEX if ((fmmap->fd = open(filename,O_RDONLY)) == -1) { Warning("cannot open file <%s>", filename); @@ -751,19 +751,19 @@ bool MmapFile (char *filename,struct filemmap *fmmap) fstat(fmmap->fd,&stat); fmmap->size=stat.st_size; # ifdef HAVE_MMAP - fmmap->mmap = mmap(NULL,fmmap->size, PROT_READ, MAP_SHARED,fmmap->fd,0); - if (fmmap->mmap == (char*)-1) { + fmmap->dp_mmap = mmap(NULL,fmmap->size, PROT_READ, MAP_SHARED,fmmap->fd,0); + if (fmmap->dp_mmap == (char*)-1) { Warning("cannot mmap file <%s>",filename); - fmmap->mmap=NULL; + fmmap->dp_mmap=NULL; close(fmmap->fd); return(true); } # else /* HAVE_MMAP */ - fmmap->mmap = malloc(fmmap->size); - if (read(fmmap->fd,fmmap->mmap,fmmap->size)size) { + fmmap->dp_mmap = malloc(fmmap->size); + if (read(fmmap->fd,fmmap->dp_mmap,fmmap->size)size) { Warning("too little data in <%s>",filename); - free(fmmap->mmap); - fmmap->mmap=NULL; + free(fmmap->dp_mmap); + fmmap->dp_mmap=NULL; close(fmmap->fd); return(true); } @@ -783,8 +783,8 @@ bool MmapFile (char *filename,struct filemmap *fmmap) Warning("cannot CreateFileMapping() file <%s>", filename); return(true); } - fmmap->mmap = MapViewOfFile(fmmap->hMap, FILE_MAP_READ, 0, 0, 0); - if (fmmap->mmap == NULL) { + fmmap->dp_mmap = MapViewOfFile(fmmap->hMap, FILE_MAP_READ, 0, 0, 0); + if (fmmap->dp_mmap == NULL) { Warning("cannot MapViewOfFile() file <%s>", filename); CloseHandle (fmmap->hMap); CloseHandle (fmmap->hFile); @@ -796,21 +796,21 @@ bool MmapFile (char *filename,struct filemmap *fmmap) void UnMmapFile(struct filemmap* fmmap) { - if (fmmap->mmap!=NULL) { + if (fmmap->dp_mmap!=NULL) { #ifndef MIKTEX # ifdef HAVE_MMAP - if (munmap(fmmap->mmap,fmmap->size)) - Warning("cannot munmap file at 0x%X",fmmap->mmap); + if (munmap(fmmap->dp_mmap,fmmap->size)) + Warning("cannot munmap file at 0x%X",fmmap->dp_mmap); if (close(fmmap->fd)) Warning("cannot close file descriptor %d",fmmap->fd); # else /* HAVE_MMAP */ - free(fmmap->mmap); + free(fmmap->dp_mmap); # endif /* HAVE_MMAP */ #else /* MIKTEX */ - UnmapViewOfFile (fmmap->mmap); + UnmapViewOfFile (fmmap->dp_mmap); CloseHandle (fmmap->hMap); CloseHandle (fmmap->hFile); #endif /* MIKTEX */ } - fmmap->mmap=NULL; + fmmap->dp_mmap=NULL; } diff --git a/Build/source/texk/dvipng/pk.c b/Build/source/texk/dvipng/pk.c index 4ff254172f7..6eb7be92530 100644 --- a/Build/source/texk/dvipng/pk.c +++ b/Build/source/texk/dvipng/pk.c @@ -323,7 +323,7 @@ void InitPK(struct font_entry * tfontp) Message(BE_VERBOSE,"<%s>", tfontp->name); if (MmapFile(tfontp->name,&(tfontp->fmmap))) Fatal("font file %s unusable", tfontp->name); - position=(unsigned char*)tfontp->fmmap.mmap; + position=(unsigned char*)tfontp->fmmap.dp_mmap; if (tfontp->fmmap.size < 2 || tfontp->fmmap.size < 3+*(position+2)+16) Fatal("PK file %s ends prematurely",tfontp->name); if (*position++ != PK_PRE) @@ -353,7 +353,7 @@ void InitPK(struct font_entry * tfontp) position = skip_specials(position); while (*position != PK_POST) { DEBUG_PRINT(DEBUG_PK,("\n @%ld PK CHAR:\t%d", - (long)position - (long)tfontp->fmmap.mmap, *position)); + (long)position - (long)tfontp->fmmap.dp_mmap, *position)); if ((tcharptr = malloc(sizeof(struct char_entry))) == NULL) Fatal("cannot malloc space for char_entry"); tcharptr->flag_byte = *position; diff --git a/Build/source/texk/dvipng/sfd.c b/Build/source/texk/dvipng/sfd.c index da9bd40c0a1..f69d7f4ed73 100644 --- a/Build/source/texk/dvipng/sfd.c +++ b/Build/source/texk/dvipng/sfd.c @@ -42,8 +42,8 @@ struct subfont* ReadSubfont(char* sfdname, char *infix) } DEBUG_PRINT((DEBUG_FT|DEBUG_ENC),("\n OPEN SUBFONT:\t'%s'", sfdfile)); if (MmapFile(sfdfile,&fmmap)) return(NULL); - pos=fmmap.mmap; - max=fmmap.mmap+fmmap.size; + pos=fmmap.dp_mmap; + max=fmmap.dp_mmap+fmmap.size; while(posdata=NULL; tcharptr->tfmw=width[*position]; diff --git a/Build/source/texk/dvipng/vf.c b/Build/source/texk/dvipng/vf.c index 0d0f74298b0..382e2f6b15c 100644 --- a/Build/source/texk/dvipng/vf.c +++ b/Build/source/texk/dvipng/vf.c @@ -62,7 +62,7 @@ void InitVF(struct font_entry * tfontp) Message(BE_VERBOSE,"<%s>", tfontp->name); if (MmapFile(tfontp->name,&(tfontp->fmmap))) Fatal("font file %s unusable", tfontp->name); - position=(unsigned char*)tfontp->fmmap.mmap; + position=(unsigned char*)tfontp->fmmap.dp_mmap; if (*(position) != PRE) Fatal("unknown font format in file %s",tfontp->name); if (*(position+1) != VF_ID) @@ -82,7 +82,7 @@ void InitVF(struct font_entry * tfontp) position += 8; while(*position >= FNT_DEF1 && *position <= FNT_DEF4) { DEBUG_PRINT(DEBUG_VF,("\n @%ld VF:\t%s", - (long)position - (long)tfontp->fmmap.mmap, + (long)position - (long)tfontp->fmmap.dp_mmap, dvi_commands[*position])); FontDef(position,tfontp); length = dvi_commandlength[*position]; @@ -98,7 +98,7 @@ void InitVF(struct font_entry * tfontp) /* Read char definitions */ while(*position < FNT_DEF1) { DEBUG_PRINT(DEBUG_VF,("\n@%ld VF CHAR:\t", - (long)position - (long)tfontp->fmmap.mmap)); + (long)position - (long)tfontp->fmmap.dp_mmap)); tcharptr=xmalloc(sizeof(struct char_entry)); switch (*position) { case LONG_CHAR: -- cgit v1.2.3