← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gettext/utopic

« back to all changes in this revision

Viewing changes to gnulib-local/lib/unistd.in.h.diff

  • Committer: Colin Watson
  • Date: 2010-08-01 21:36:08 UTC
  • mfrom: (2.1.10 sid)
  • Revision ID: cjwatson@canonical.com-20100801213608-yy7vkm8lpatep3ci
merge from Debian 0.18.1.1-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnulib-local/lib/unistd.in.h.diff
 
1
--- unistd.in.h.orig    2010-05-09 02:37:27.000000000 +0200
 
2
+++ unistd.in.h 2010-05-09 10:51:25.000000000 +0200
 
3
@@ -93,7 +93,11 @@
 
4
 
 
5
 /* Get getopt(), optarg, optind, opterr, optopt.
 
6
    But avoid namespace pollution on glibc systems.  */
 
7
-#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
 
8
+/* Also, don't include <getopt.h> inside libgettextpo, because we use
 
9
+   the getopt module only in gettext-tools/gnulib-lib/, not in
 
10
+   gettext-tools/libgettextpo/, but there is only a single
 
11
+   GNULIB_UNISTD_H_GETOPT variable for both.  */
 
12
+#if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
 
13
 # include <getopt.h>
 
14
 #endif
 
15