Submitted by Robert Niemi:

bug #35800: Compilation error on certain systems if parport is disabled
* linux_ppdev.h: Conditionalize inclusion of <linux/parport.h> and
<linux/ppdev.h> on HAVE_PARPORT




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1198 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2013-09-02 20:53:12 +00:00
parent 412a7be03e
commit f051a3a6e0
3 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2013-09-02 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Robert Niemi:
bug #35800: Compilation error on certain systems if parport is disabled
* linux_ppdev.h: Conditionalize inclusion of <linux/parport.h> and
<linux/ppdev.h> on HAVE_PARPORT
2013-09-02 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2013-09-02 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4 bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4

1
NEWS
View File

@ -85,6 +85,7 @@ Current:
- bug #38023: avrdude doesn't return an error code when attempting - bug #38023: avrdude doesn't return an error code when attempting
to upload an invalid Intel HEX file to upload an invalid Intel HEX file
- bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4 - bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4
- bug #35800: Compilation error on certain systems if parport is disabled
* Keep track of input file contents * Keep track of input file contents

View File

@ -24,8 +24,10 @@
#define OBSOLETE__IOW _IOW #define OBSOLETE__IOW _IOW
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef HAVE_PARPORT
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/ppdev.h> #include <linux/ppdev.h>
#endif
#include <stdlib.h> #include <stdlib.h>