Changeset 7 for abuse/trunk/src/imlib/include/specs.hppTweet

Timestamp:

Nov 6, 2005, 7:07:59 PM (18 years ago)

Author:

Sam Hocevar

Message:

• fixed int size issues here and there

File:

• abuse/trunk/src/imlib/include/specs.hpp (modified) (3 diffs)

abuse/trunk/src/imlib/include/specs.hpp

@@ -7 +7 @@
 #include <fcntl.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 extern char *spec_types[];
@@ -96 +97 @@
 
   // these read and writes, allways read/write Intel endian-ness
-  unsigned short read_short();
-  unsigned long read_long();
-  unsigned char read_byte();
+  uint16_t read_short();
+  uint32_t read_long();
+  uint8_t read_byte();
   double read_double();
-  void write_short(unsigned short x);
-  void write_long(unsigned long x);
-  void write_byte(unsigned char x);
+  void write_short(uint16_t x);
+  void write_long(uint32_t x);
+  void write_byte(uint8_t x);
   void write_double(double x);
   void set_read_buffer_size(long size);
@@ -193 +194 @@
                          char *link_filename=NULL);*/
 
-unsigned short read_short(FILE *fp);
-unsigned long read_long(FILE *fp);
-unsigned short read_other_long(FILE *fp);
-unsigned long read_other_short(FILE *fp);
-unsigned char read_byte(FILE *fp);
-
-void write_short(FILE *fp, unsigned short x);
-void write_long(FILE *fp, unsigned long x);
-void write_other_short(FILE *fp, unsigned short x);
-void write_other_long(FILE *fp, unsigned long x);
-void write_byte(FILE *fp, unsigned char x);
+uint16_t read_short(FILE *fp);
+uint32_t read_long(FILE *fp);
+uint32_t read_other_long(FILE *fp);
+uint16_t read_other_short(FILE *fp);
+uint8_t read_byte(FILE *fp);
+
+void write_short(FILE *fp, uint16_t x);
+void write_long(FILE *fp, uint32_t x);
+void write_other_short(FILE *fp, uint16_t x);
+void write_other_long(FILE *fp, uint32_t x);
+void write_byte(FILE *fp, uint8_t x);
 
 void set_spec_main_file(char *filename, int Search_order);