Changeset 23717


Ignore:
Timestamp:
02/17/11 11:00:10 (10 years ago)
Author:
sjm84
Message:

A few more fixes for x64 Greenstone

Location:
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/mgfelics.c

    r16583 r23717  
    5555  FILE *fp_in = (stdin), *fp_out = (stdout);
    5656  int width, height, maxval;
    57   u_long magic;
     57  mg_u_long magic;
    5858  char *filename = NULL;
    5959  unsigned int *line;
  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/pbmtools.c

    r16583 r23717  
    6464pbm_isapbmfile (FILE * fp)
    6565{
    66   u_long magic;
     66  mg_u_long magic;
    6767
    6868  magic = getmagicno_short (fp);
  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.c

    r16583 r23717  
    230230
    231231void
    232 magic_write (FILE * fp, u_long magic_num)
     232magic_write (FILE * fp, mg_u_long magic_num)
    233233{
    234234  HTONUL(magic_num);  /* [RPAP - Jan 97: Endian Ordering] */
     
    239239
    240240void
    241 magic_check (FILE * fp, u_long magic_num)
    242 {
    243   u_long magic;
     241magic_check (FILE * fp, mg_u_long magic_num)
     242{
     243  mg_u_long magic;
    244244  if (fread (&magic, sizeof (magic), 1, fp) != 1 || NTOHUL(magic) != magic_num)  /* [RPAP - Jan 97: Endian Ordering] */
    245245    error_msg ("magic num", "Incorrect magic number.", "");
     
    247247
    248248
    249 u_long
     249mg_u_long
    250250magic_read (FILE * fp)
    251251{
    252   u_long magic;
     252  mg_u_long magic;
    253253  if (fread (&magic, sizeof (magic), 1, fp) != 1)
    254254    error_msg ("magic num", "Couldn't read magic number.", "");
  • main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.h

    r16583 r23717  
    4545#define MAGIC_BILEVEL           GEN_MAGIC('M','G','B','I')
    4646#define MAGIC_TIC               GEN_MAGIC('M','G','T','C')
    47 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
     47#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
    4848/* --------------------------------------- */
    4949
     
    6868void readline (char str[], FILE * fp);
    6969
    70 void magic_write (FILE * fp, u_long magic_num);
    71 void magic_check (FILE * fp, u_long magic_num);
    72 u_long magic_read (FILE * fp);
     70void magic_write (FILE * fp, mg_u_long magic_num);
     71void magic_check (FILE * fp, mg_u_long magic_num);
     72mg_u_long magic_read (FILE * fp);
    7373/* kerry's code */
    7474
Note: See TracChangeset for help on using the changeset viewer.