summaryrefslogtreecommitdiff
path: root/sanei/sanei_pp.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
commit9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch)
treec9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /sanei/sanei_pp.c
parent446e9454b8cbe5b689149415d11d36e88442ca88 (diff)
parent154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff)
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'sanei/sanei_pp.c')
-rw-r--r--sanei/sanei_pp.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
index 89f3232..5150313 100644
--- a/sanei/sanei_pp.c
+++ b/sanei/sanei_pp.c
@@ -15,9 +15,7 @@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* As a special exception, the authors of SANE give permission for
* additional uses of the libraries contained in this release of SANE.
@@ -135,11 +133,9 @@ inb( u_long port )
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_pp.h"
-#if defined(STDC_HEADERS)
-# include <errno.h>
-# include <stdio.h>
-# include <stdlib.h>
-#endif
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#if defined(HAVE_STRING_H)
# include <string.h>
#elif defined(HAVE_STRINGS_H)
@@ -1333,7 +1329,7 @@ sanei_pp_open( const char *dev, int *fd )
DBG( 6, "sanei_pp_open: basically, this backend does only compile\n" );
DBG( 6, "sanei_pp_open: on x86 architectures. Furthermore it\n" );
DBG( 6, "sanei_pp_open: needs ioperm() and inb()/outb() calls.\n" );
- DBG( 6, "sanei_pp_open: alternativly it makes use of libieee1284\n" );
+ DBG( 6, "sanei_pp_open: alternatively it makes use of libieee1284\n" );
DBG( 6, "sanei_pp_open: (which isn't present either)\n");
return SANE_STATUS_INVAL;
}