9f64e0c
diff -ur par2cmdline-0.4-orig/letype.h par2cmdline-0.4/letype.h
9f64e0c
--- par2cmdline-0.4-orig/letype.h	2003-05-26 20:01:17.000000000 +0200
9f64e0c
+++ par2cmdline-0.4/letype.h	2006-05-09 10:47:29.000000000 +0200
9f64e0c
@@ -28,44 +28,15 @@
9f64e0c
 
9f64e0c
 #else
9f64e0c
 
9f64e0c
-class leu16
9f64e0c
+struct leu16
9f64e0c
 {
9f64e0c
-public:
9f64e0c
-  leu16(void);
9f64e0c
-
9f64e0c
-  leu16(const leu16 &other);
9f64e0c
-  leu16& operator=(const leu16 &other);
9f64e0c
-
9f64e0c
-  leu16(const u16 &other);
9f64e0c
   leu16& operator=(const u16 &other);
9f64e0c
 
9f64e0c
   operator u16(void) const;
9f64e0c
 
9f64e0c
-protected:
9f64e0c
   u16 value;
9f64e0c
 };
9f64e0c
 
9f64e0c
-inline leu16::leu16(void)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu16::leu16(const leu16 &other)
9f64e0c
-: value(other.value)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu16& leu16::operator =(const leu16 &other)
9f64e0c
-{
9f64e0c
-  value = other.value;
9f64e0c
-  return *this;
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu16::leu16(const u16 &other)
9f64e0c
-{
9f64e0c
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
9f64e0c
-}
9f64e0c
-
9f64e0c
 inline leu16& leu16::operator=(const u16 &other)
9f64e0c
 {
9f64e0c
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
@@ -81,46 +52,15 @@
9f64e0c
 }
9f64e0c
 
9f64e0c
 
9f64e0c
-class leu32
9f64e0c
+struct leu32
9f64e0c
 {
9f64e0c
-public:
9f64e0c
-  leu32(void);
9f64e0c
-
9f64e0c
-  leu32(const leu32 &other);
9f64e0c
-  leu32& operator=(const leu32 &other);
9f64e0c
-
9f64e0c
-  leu32(const u32 &other);
9f64e0c
   leu32& operator=(const u32 &other);
9f64e0c
 
9f64e0c
   operator u32(void) const;
9f64e0c
 
9f64e0c
-protected:
9f64e0c
   u32 value;
9f64e0c
 };
9f64e0c
 
9f64e0c
-inline leu32::leu32(void)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu32::leu32(const leu32 &other)
9f64e0c
-: value(other.value)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu32& leu32::operator =(const leu32 &other)
9f64e0c
-{
9f64e0c
-  value = other.value;
9f64e0c
-  return *this;
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu32::leu32(const u32 &other)
9f64e0c
-{
9f64e0c
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
9f64e0c
-}
9f64e0c
-
9f64e0c
 inline leu32& leu32::operator=(const u32 &other)
9f64e0c
 {
9f64e0c
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
@@ -140,50 +80,15 @@
9f64e0c
 }
9f64e0c
 
9f64e0c
 
9f64e0c
-class leu64
9f64e0c
+struct leu64
9f64e0c
 {
9f64e0c
-public:
9f64e0c
-  leu64(void);
9f64e0c
-
9f64e0c
-  leu64(const leu64 &other);
9f64e0c
-  leu64& operator=(const leu64 &other);
9f64e0c
-
9f64e0c
-  leu64(const u64 &other);
9f64e0c
   leu64& operator=(const u64 &other);
9f64e0c
 
9f64e0c
   operator u64(void) const;
9f64e0c
 
9f64e0c
-protected:
9f64e0c
   u64 value;
9f64e0c
 };
9f64e0c
 
9f64e0c
-inline leu64::leu64(void)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu64::leu64(const leu64 &other)
9f64e0c
-: value(other.value)
9f64e0c
-{
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu64& leu64::operator =(const leu64 &other)
9f64e0c
-{
9f64e0c
-  value = other.value;
9f64e0c
-  return *this;
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline leu64::leu64(const u64 &other)
9f64e0c
-{
9f64e0c
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff);
9f64e0c
-  ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff);
9f64e0c
-}
9f64e0c
-
9f64e0c
 inline leu64& leu64::operator=(const u64 &other)
9f64e0c
 {
9f64e0c
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
9f64e0c
diff -ur par2cmdline-0.4-orig/md5.h par2cmdline-0.4/md5.h
9f64e0c
--- par2cmdline-0.4-orig/md5.h	2003-08-02 01:41:04.000000000 +0200
9f64e0c
+++ par2cmdline-0.4/md5.h	2006-05-09 10:47:29.000000000 +0200
9f64e0c
@@ -20,6 +20,13 @@
9f64e0c
 #ifndef __MD5_H__
9f64e0c
 #define __MD5_H__
9f64e0c
 
9f64e0c
+#ifdef WIN32
9f64e0c
+#pragma pack(push, 1)
9f64e0c
+#define PACKED
9f64e0c
+#else
9f64e0c
+#define PACKED __attribute__ ((packed))
9f64e0c
+#endif
9f64e0c
+
9f64e0c
 // This file defines the MD5Hash and MD5Context objects which are used
9f64e0c
 // to compute and manipulate the MD5 Hash values for a block of data.
9f64e0c
 
9f64e0c
@@ -35,12 +42,11 @@
9f64e0c
 
9f64e0c
 // MD5 Hash value
9f64e0c
 
9f64e0c
-class MD5Hash
9f64e0c
-{
9f64e0c
-public:
9f64e0c
-  // Constructor does not initialise the value
9f64e0c
-  MD5Hash(void) {};
9f64e0c
+struct MD5Hash;
9f64e0c
+ostream& operator<<(ostream &s, const MD5Hash &hash);
9f64e0c
 
9f64e0c
+struct MD5Hash
9f64e0c
+{
9f64e0c
   // Comparison operators
9f64e0c
   bool operator==(const MD5Hash &other) const;
9f64e0c
   bool operator!=(const MD5Hash &other) const;
9f64e0c
@@ -54,13 +60,8 @@
9f64e0c
   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
9f64e0c
   string print(void) const;
9f64e0c
 
9f64e0c
-  // Copy and assignment
9f64e0c
-  MD5Hash(const MD5Hash &other);
9f64e0c
-  MD5Hash& operator=(const MD5Hash &other);
9f64e0c
-
9f64e0c
-public:
9f64e0c
   u8 hash[16]; // 16 byte MD5 Hash value
9f64e0c
-};
9f64e0c
+} PACKED;
9f64e0c
 
9f64e0c
 // Intermediate computation state
9f64e0c
 
9f64e0c
@@ -144,16 +145,9 @@
9f64e0c
   return !other.operator<(*this);
9f64e0c
 }
9f64e0c
 
9f64e0c
-inline MD5Hash::MD5Hash(const MD5Hash &other)
9f64e0c
-{
9f64e0c
-  memcpy(&hash, &other.hash, sizeof(hash));
9f64e0c
-}
9f64e0c
-
9f64e0c
-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other)
9f64e0c
-{
9f64e0c
-  memcpy(&hash, &other.hash, sizeof(hash));
9f64e0c
-
9f64e0c
-  return *this;
9f64e0c
-}
9f64e0c
+#ifdef WIN32
9f64e0c
+#pragma pack(pop)
9f64e0c
+#endif
9f64e0c
+#undef PACKED
9f64e0c
 
9f64e0c
 #endif // __MD5_H__