← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libgsm/utopic

« back to all changes in this revision

Viewing changes to debian/patches/04_includes.patch

  • Committer: Package Import Robot
  • Author(s): Jochen Friedrich, Jari Aalto, Jochen Friedrich
  • Date: 2012-04-12 17:34:56 UTC
  • mfrom: (4.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20120412173456-1bffys50cu6opaqi
Tags: 1.0.13-4
http://bugs.debian.org/664389
[ Jari Aalto ]
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
  Note: patch 04 was updated with "quilt refresh" to make
  it apply cleanly. (Closes: #664389)
* Update to Standards-Version to 3.9.3 and debhelper to 9.

[ Jochen Friedrich ]
* Convert lib to multiarch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_includes.patch
 
1
From: Jochen Friedrich <jochen@scram.de>
 
2
Subject: Change errno handling to fix Hurd (Closes: #164191, #164194)
 
3
 
 
4
---
 
5
 inc/toast.h |    9 +++++++--
 
6
 src/code.c  |    4 ++--
 
7
 2 files changed, 9 insertions(+), 4 deletions(-)
 
8
 
 
9
--- a/inc/toast.h
 
10
+++ b/inc/toast.h
 
11
@@ -16,11 +16,12 @@
 
12
 
 
13
 #include <stdio.h>
 
14
 #include <ctype.h>
 
15
+#include <pthread.h>
 
16
 #include <signal.h>
 
17
 
 
18
 #include <errno.h>
 
19
-#ifndef        HAS_ERRNO_DECL
 
20
-        extern int     errno;
 
21
+#ifndef errno
 
22
+ extern int    errno;
 
23
 #endif
 
24
 
 
25
 #ifdef HAS_LIMITS_H
 
26
@@ -37,6 +38,10 @@
 
27
 # endif
 
28
 #endif
 
29
 
 
30
+#ifdef  HAS_STDIO_H
 
31
+# include <stdio.h>
 
32
+#endif
 
33
+
 
34
 #include "gsm.h"
 
35
 
 
36
 #ifndef        S_ISREG
 
37
--- a/src/code.c
 
38
+++ b/src/code.c
 
39
@@ -9,8 +9,8 @@
 
40
 #include       "gsm_config.h"
 
41
 
 
42
 
 
43
-#ifdef HAS_STDLIB_H
 
44
-#include       <stdlib.h>
 
45
+#ifdef HAS_STRING_H
 
46
+#include       <string.h>
 
47
 #else
 
48
 #      include "proto.h"
 
49
        extern char     * memcpy P((char *, char *, int));