solaris fixes.

[swftools.git] / src / swfcombine.c

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 2b189b9..6f082f3 100644 (file)
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -321,12 +321,12 @@ void makestackmaster(u8**masterdata, int*masterlength)
     pos += sizeof(head);
     *pos++ = fileversion;
     fixpos = (u32*)pos;
-    *(u32*)pos = SWAP32(0x12345678); // to be overwritten
+    PUT32(pos, 0x12345678); // to be overwritten
     pos += 4;
     writeRECT(&pos, &box);
-    *(u16*)pos = SWAP16(0x2000); // framerate
+    PUT16(pos, 0x2000) // framerate
     pos += 2;
-    *(u16*)pos = SWAP16(numslaves);
+    PUT16(pos, numslaves) // framerate
     pos += 2;
     for(t=0;t<numslaves;t++)
     {
@@ -339,31 +339,31 @@ void makestackmaster(u8**masterdata, int*masterlength)
        } 
        namelen = strlen(slave_name[t]);
 
-       *(u16*)&pos[0] = SWAP16((u16)(TAGID_DEFINESPRITE<<6) + 6);
-       *(u16*)&pos[2] = SWAP16(t+1); //ID
-       *(u16*)&pos[4] = 0; // Frames
-       *(u16*)&pos[6] = 0; // TAG1
-       *(u16*)&pos[8] = SWAP16((u16)(TAGID_PLACEOBJECT2<<6) + 6 + namelen);
-       *(u16*)&pos[10]= SWAP16(34); //flags: id+name
-       *(u16*)&pos[11]= SWAP16(1+t); // depth
-       *(u16*)&pos[13]= SWAP16(t+1); // id
+       PUT16(&pos[0] , ((u16)(TAGID_DEFINESPRITE<<6) + 6));
+       PUT16(&pos[2] , (t+1)); //ID
+       PUT16(&pos[4] , 0); // Frames
+       PUT16(&pos[6] , 0); // TAG1
+       PUT16(&pos[8] , ((u16)(TAGID_PLACEOBJECT2<<6) + 6 + namelen));
+       PUT16(&pos[10], (34)); //flags: id+name
+       PUT16(&pos[11], (1+t)); // depth
+       PUT16(&pos[13], (t+1)); // id
        sprintf(&pos[15],slave_name[t]);
        pos += 15 + namelen + 1;
        if(!config.stack1 || t == numslaves-1) {
-           *(u16*)&pos[0]= SWAP16((u16)(TAGID_SHOWFRAME<<6) + 0);
+           PUT16(&pos[0],((u16)(TAGID_SHOWFRAME<<6) + 0));
            pos += 2;
        }
        if(!config.stack)
        if(t!=numslaves-1)
        {
-           *(u16*)&pos[0]= SWAP16((u16)(TAGID_REMOVEOBJECT2<<6) + 2);
-           *(u16*)&pos[2]= SWAP16(1+t); // depth;
+           PUT16(&pos[0], ((u16)(TAGID_REMOVEOBJECT2<<6) + 2));
+           PUT16(&pos[2], (1+t)); // depth;
            pos += 4;
        }
     }
-    *(u16*)pos = SWAP16(TAGID_END<<6 + 0);
+    PUT16(pos, (TAGID_END<<6 + 0));
     *masterlength = pos - *masterdata;
-    *fixpos = SWAP32(*masterlength);
+    PUT32(fixpos, *masterlength);
 }
 
 struct config_t config;
@@ -505,11 +505,11 @@ int main(int argn, char *argv[])
                slavedata[1] = 'W';
                slavedata[2] = 'S';
                slavedata[3] = 4; //version
-               *(u32*)&slavedata[4] = SWAP32(14); // length
+               PUT32(&slavedata[4], 14); ; // length
                slavedata[8] = 0; // boundingbox
-               *(u16*)&slavedata[9] = SWAP16(0); // rate
-               *(u16*)&slavedata[11] = SWAP16(0); // count
-               *(u16*)&slavedata[13] = SWAP16(0); // end tag
+               PUT16(&slavedata[9] , (0)); // rate
+               PUT16(&slavedata[11] , (0)); // count
+               PUT16(&slavedata[13] , (0)); // end tag
                slavelength = 17;
            }