CVS: rdesktop bitmap.c,1.20,1.21

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12527

Modified Files:
	bitmap.c 
Log Message:
Only do the memcpy if NEED_ALIGNMENT is defined
TODO: configure-test which defines it


Index: bitmap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/bitmap.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bitmap.c	16 Apr 2004 09:11:03 -0000	1.20
--- bitmap.c	27 Apr 2004 09:04:42 -0000	1.21
***************
*** 331,341 ****
--- 331,353 ----
  				break;
  			case 8:	/* Bicolour */
+ #ifdef NEED_ALIGNMENT
  				memcpy(&colour1,&CVAL2(input),2);
+ #else
+ 				colour1 = CVAL2(input);
+ #endif
  			case 3:	/* Colour */
+ #ifdef NEED_ALIGNMENT
  				memcpy(&colour2,&CVAL2(input),2);
+ #else
+ 				colour2 = CVAL2(input);
+ #endif
  				break;
  			case 6:	/* SetMix/Mix */
  			case 7:	/* SetMix/FillOrMix */
+ #ifdef NEED_ALIGNMENT
  				memcpy(&mix,&CVAL2(input),2);
+ #else
+ 				mix = CVAL2(input);
+ #endif
  				opcode -= 5;
  				break;
***************
*** 425,429 ****
--- 437,445 ----
  					break;
  				case 4:	/* Copy */
+ #ifdef NEED_ALIGNMENT
  					REPEAT(memcpy(&line[x],&CVAL2(input),2))
+ #else
+ 					REPEAT(line[x] = CVAL2(input))
+ #endif
  					break;
  				case 8:	/* Bicolour */



-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297