nls/FreeBSD/msgcat.h.patch

   1 --- msgcat.h.orig       2007-02-07 11:30:18.000000000 -0800
   2 +++ msgcat.h    2007-02-07 11:57:46.000000000 -0800
   3 @@ -44,7 +44,7 @@
   4   */
   5
   6  /* For or'd constants */
   7 -#define MCMakeId(s,m)          (unsigned long) ( ((unsigned short)s << (sizeof(short)*8)) \
   8 +#define MCMakeId(s,m)          (u_int32_t) ( ((unsigned short)s << (sizeof(short)*8)) \
   9                                                  | (unsigned short)m )
  10  #define MCSetId(id)            (unsigned int) ( id >> (sizeof(short) * 8) )
  11  #define MCMsgId(id)            (unsigned int) ( (id << (sizeof(short) * 8)) \
  12 @@ -54,7 +54,7 @@
  13  #define MCLastMsg      0
  14  #define MCLastSet      0
  15
  16 -#define MCMajorVer     1L
  17 +#define MCMajorVer     1
  18  #define MCMinorVer     0
  19
  20  /*
  21 @@ -100,38 +100,44 @@
  22      struct _MCSetT     *set;
  23  } MCOffsetT;
  24
  25 +#ifdef __LP64__
  26 +#pragma pack(4)
  27 +#endif /* __LP64__ */
  28  /*
  29   * MCMsgT - Message structure (disk and runtime)
  30   */
  31  typedef struct _MCMsgT {
  32 -    long       msgId;          /* Id of this message */
  33 +    int32_t    msgId;          /* Id of this message */
  34      MCOffsetT  msg;            /* Relative offset on disk or pointer in memory */
  35 -    long       invalid;        /* Valid on disk, loaded in memory */
  36 +    int32_t    invalid;        /* Valid on disk, loaded in memory */
  37  } MCMsgT;
  38
  39  /*
  40   * MCSetT - Set structure (disk and runtime)
  41   */
  42  typedef struct _MCSetT {
  43 -    long       setId;          /* Id of this set */
  44 +    int32_t    setId;          /* Id of this set */
  45      off_t      nextSet;        /* Offset of next set on disk */
  46      union {
  47         off_t   firstMsg;       /* Offset to first Msg (while on disk) */
  48         MCMsgT  *msgs;          /* Pointer to array of msgs (in mem, loaded) */
  49      } u;
  50      MCOffsetT  data;           /* Offset to data, or pointer to data */
  51 -    long       dataLen;        /* Length of data area on disk */
  52 -    long       numMsgs;        /* Number of messages */
  53 -    long       invalid;        /* Valid on disk, loaded in memory */
  54 +    int32_t    dataLen;        /* Length of data area on disk */
  55 +    int32_t    numMsgs;        /* Number of messages */
  56 +    int32_t    invalid;        /* Valid on disk, loaded in memory */
  57  } MCSetT;
  58 +#ifdef __LP64__
  59 +#pragma pack()
  60 +#endif /* __LP64__ */
  61
  62  /*
  63   * MCCatT - Runtime catalog pointer
  64   */
  65  typedef struct {
  66 -    long       loadType;       /* How to load the messages (see MSLoadType) */
  67 +    int32_t    loadType;       /* How to load the messages (see MSLoadType) */
  68      FILE        *fp;            /* File descriptor of catalog (if load-on-demand) */
  69 -    long       numSets;        /* Number of sets */
  70 +    int32_t    numSets;        /* Number of sets */
  71      MCSetT     *sets;          /* Pointer to the sets */
  72      off_t      firstSet;       /* Offset of first set on disk */
  73  } MCCatT;
  74 @@ -141,10 +147,10 @@
  75   */
  76  typedef struct {
  77      char       magic[MCMagicLen];      /* Magic cookie "*nazgul*" */
  78 -    long       majorVer;               /* ++ on incompatible changes */
  79 -    long       minorVer;               /* ++ on compatible changes */
  80 -    long       flags;                  /* Informational flags */
  81 -    long       numSets;                /* Number of valid Sets */
  82 +    int32_t    majorVer;               /* ++ on incompatible changes */
  83 +    int32_t    minorVer;               /* ++ on compatible changes */
  84 +    int32_t    flags;                  /* Informational flags */
  85 +    int32_t    numSets;                /* Number of valid Sets */
  86      off_t      firstSet;               /* Offset of first set on disk */
  87  } MCHeaderT;
  88