← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle_com.h

  • Committer: Brian Aker
  • Date: 2008-09-16 09:41:23 UTC
  • Revision ID: brian@gir.lan-20080916094123-2ws792vn896n2g53
Fixed uint/ushort issue in libdrizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle_com.h
513
513
#define sint8korr(A)    (*((int64_t *) (A)))
514
514
#define int2store(T,A)  *((uint16_t*) (T))= (uint16_t) (A)
515
515
#define int3store(T,A)  do { *(T)=  (unsigned char) ((A));\
516
 
                            *(T+1)=(unsigned char) (((uint) (A) >> 8));\
 
516
                            *(T+1)=(unsigned char) (((uint32_t) (A) >> 8));\
517
517
                            *(T+2)=(unsigned char) (((A) >> 16)); } while (0)
518
518
#define int4store(T,A)  *((long *) (T))= (long) (A)
519
519
#define int5store(T,A)  do { *(T)= (unsigned char)((A));\
597
597
                                    (((uint32_t) ((unsigned char) (A)[6])) << 16) +\
598
598
                                    (((uint32_t) ((unsigned char) (A)[7])) << 24))) <<\
599
599
                                    32))
600
 
#define int2store(T,A)       do { uint def_temp= (uint) (A) ;\
 
600
#define int2store(T,A)       do { uint32_t def_temp= (uint32_t) (A) ;\
601
601
                                  *((unsigned char*) (T))=  (unsigned char)(def_temp); \
602
602
                                   *((unsigned char*) (T)+1)=(unsigned char)((def_temp >> 8)); \
603
603
                             } while(0)
623
623
                                  *(((char *)(T))+4)= (char)(((A) >> 32)); \
624
624
                                  *(((char *)(T))+5)= (char)(((A) >> 40)); \
625
625
                                } while(0)
626
 
#define int8store(T,A)       do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
 
626
#define int8store(T,A)       do { uint32_t def_temp= (uint32_t) (A), def_temp2= (uint32_t) ((A) >> 32); \
627
627
                                  int4store((T),def_temp); \
628
628
                                  int4store((T+4),def_temp2); } while(0)
629
629
#ifdef WORDS_BIGENDIAN
721
721
                            ((unsigned char*) &def_temp)[2]=(M)[2];\
722
722
                            ((unsigned char*) &def_temp)[3]=(M)[3];\
723
723
                            (V)=def_temp; } while(0)
724
 
#define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
 
724
#define shortstore(T,A) do { uint32_t def_temp=(uint32_t) (A) ;\
725
725
                             *(((char*)T)+1)=(char)(def_temp); \
726
726
                             *(((char*)T)+0)=(char)(def_temp >> 8); } while(0)
727
727
#define longstore(T,A)  do { *(((char*)T)+3)=((A));\