← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dns2tcp/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/strnlen.diff

  • Committer: Bazaar Package Importer
  • Author(s): Simon Richter
  • Date: 2009-11-27 22:10:12 UTC
  • Revision ID: james.westby@ubuntu.com-20091127221012-isa5r22fakreijp1
Tags: 0.4.dfsg-5.1
http://bugs.debian.org/548044
* Non-maintainer upload.
* Remove clashing strnlen declarations. Thanks to Ilya Barygin for the
  patch (Closes: #548044)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/strnlen.diff
 
1
Index: dns2tcp-0.4.dfsg/common/includes/dns.h
 
2
===================================================================
 
3
--- dns2tcp-0.4.dfsg.orig/common/includes/dns.h 2009-09-23 11:55:26.000000000 +0400
 
4
+++ dns2tcp-0.4.dfsg/common/includes/dns.h      2009-09-23 12:04:32.000000000 +0400
 
5
@@ -139,8 +139,5 @@
 
6
 void    dns_simple_decode(char *input, char *output, int max_len);
 
7
 void   dns_encode(char *);
 
8
 void   *jump_end_query(void *, int, int);
 
9
-#ifndef _WIN32
 
10
-int    strnlen(char *, int len);
 
11
-#endif
 
12
 
 
13
 #endif
 
14
Index: dns2tcp-0.4.dfsg/server/includes/server.h
 
15
===================================================================
 
16
--- dns2tcp-0.4.dfsg.orig/server/includes/server.h      2009-09-23 12:05:02.000000000 +0400
 
17
+++ dns2tcp-0.4.dfsg/server/includes/server.h   2009-09-23 12:05:30.000000000 +0400
 
18
@@ -48,7 +48,6 @@
 
19
 }                      t_conf;
 
20
 
 
21
 int    do_server(t_conf *);
 
22
-int    strnlen(char *, int); /* not present ?*/
 
23
 int    delete_client(t_conf *conf, struct s_simple_list *client);
 
24
 void   delete_zombie(t_conf *conf);
 
25