CVS: rdesktop parallel.c,1.9,1.10

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

Modified Files:
	parallel.c 
Log Message:
build on non-linux again


Index: parallel.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/parallel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** parallel.c	5 Mar 2004 06:48:08 -0000	1.9
--- parallel.c	5 Mar 2004 09:36:49 -0000	1.10
***************
*** 9,15 ****
  #include <fcntl.h>
  #include <sys/ioctl.h>
- #include <linux/lp.h>
  #include <errno.h>
  
  extern int errno;
  
--- 9,18 ----
  #include <fcntl.h>
  #include <sys/ioctl.h>
  #include <errno.h>
  
+ #if defined(__linux__)
+ #include <linux/lp.h>
+ #endif
+ 
  extern int errno;
  
***************
*** 87,91 ****
--- 90,97 ----
  		perror("fcntl");
  
+ #if defined(LPABORT)
+ 	/* Retry on errors */
  	ioctl(parallel_fd, LPABORT, (int) 1);
+ #endif
  
  	g_rdpdr_device[device_id].handle = parallel_fd;
***************
*** 135,138 ****
--- 141,145 ----
  				rc = STATUS_DEVICE_POWERED_OFF;
  		}
+ #if defined(LPGETSTATUS)
  		if (ioctl(handle, LPGETSTATUS, &status) == 0)
  		{
***************
*** 140,143 ****
--- 147,151 ----
  			printf("parallel_write: status = %d, errno = %d\n", status, errno);
  		}
+ #endif
  	}
  	*result = n;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click