Diff of /src/util.h [e74fc3] .. [16bdbf] Maximize Restore

  Switch to unified view

a/src/util.h b/src/util.h
1
/*
1
/*
2
  $Id: util.h,v 1.12 2005/02/21 09:00:53 rocky Exp $
2
  $Id: util.h,v 1.13 2005/10/05 09:48:12 rocky Exp $
3
3
4
  Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
4
  Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
5
  
5
  
6
  This program is free software; you can redistribute it and/or modify
6
  This program is free software; you can redistribute it and/or modify
7
  it under the terms of the GNU General Public License as published by
7
  it under the terms of the GNU General Public License as published by
...
...
42
#ifdef HAVE_STDARG_H
42
#ifdef HAVE_STDARG_H
43
/* Get a definition for va_list.  */
43
/* Get a definition for va_list.  */
44
#include <stdarg.h>
44
#include <stdarg.h>
45
#endif
45
#endif
46
46
47
/* FreeBSD 4 has getopt in unistd.h. So we include that before
48
   getopt.h */
49
#ifdef HAVE_UNISTD_H
50
#include <unistd.h>
51
#endif
52
#ifdef HAVE_GETOPT_H
47
#include <popt.h>
53
#include <getopt.h>
48
/* Accomodate to older popt that doesn't support the "optional" flag */
49
#ifndef POPT_ARGFLAG_OPTIONAL
50
#define POPT_ARGFLAG_OPTIONAL 0
51
#endif
54
#endif
52
55
53
#ifdef ENABLE_NLS
56
#ifdef ENABLE_NLS
54
#include <locale.h>
57
#include <locale.h>
55
#    include <libintl.h>
58
#    include <libintl.h>