← Back to branch summary

~ubuntu-branches/ubuntu/lucid/x11-xserver-utils/lucid

« back to all changes in this revision

Viewing changes to xhost/xhost.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-01-08 18:38:47 UTC
  • mfrom: (5.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100108183847-wuunshkmhcyh7vzc
Tags: 7.5+1ubuntu1
* Merge from Debian.  Remaining Ubuntu changes:
  - Add 100_xrandr-output.patch: When using --scale or --transform, verify
    a valid output parameter is used; crashes otherwise.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xhost/xhost.c
141
141
 
142
142
#define NAMESERVER_TIMEOUT 5    /* time to wait for nameserver */
143
143
 
144
 
volatile int nameserver_timedout;
145
 
 
146
 
char *ProgramName;
 
144
static volatile int nameserver_timedout;
 
145
 
 
146
static char *ProgramName;
147
147
 
148
148
#ifdef NEEDSOCKETS
149
149
static int 
175
175
}
176
176
#endif /* NEEDSOCKETS */
177
177
 
178
 
Display *dpy;
 
178
static Display *dpy;
179
179
 
180
180
int
181
181
main(int argc, char *argv[])