Commit bf1feed3 authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder
Browse files

Move include of popt stuff here. It has no business in libgnumeric.h

2005-11-01  Morten Welinder  <terra@gnome.org>

	* src/main-application.c: Move include of popt stuff here.  It has
	no business in libgnumeric.h
parent 9954968b
2005-11-01 Morten Welinder <terra@gnome.org>
* src/main-application.c: Move include of popt stuff here. It has
no business in libgnumeric.h
2005-11-01 J.H.M. Dassen (Ray) <jdassen@debian.org>
* README: Updated list archives URL (Debian #336699).
......
2005-11-01 Morten Welinder <terra@gnome.org>
* src/main-application.c: Move include of popt stuff here. It has
no business in libgnumeric.h
2005-11-01 J.H.M. Dassen (Ray) <jdassen@debian.org>
* README: Updated list archives URL (Debian #336699).
......
......@@ -3,11 +3,6 @@
#include "gutils.h"
#ifdef WIN32
#define POPT_STATIC
#endif
#include <popt.h>
extern int gnumeric_debugging;
extern int dependency_debugging;
extern int expression_sharing_debugging;
......
......@@ -14,6 +14,10 @@
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "libgnumeric.h"
#ifdef WIN32
#define POPT_STATIC
#endif
#include <popt.h>
#include "command-context.h"
#include <goffice/app/io-context.h>
......
......@@ -24,6 +24,10 @@
#include <goffice/utils/go-file.h>
#include <gsf/gsf-utils.h>
#include <string.h>
#ifdef WIN32
#define POPT_STATIC
#endif
#include <popt.h>
static gboolean ssconvert_show_version = FALSE;
static gboolean ssconvert_list_exporters = FALSE;
......@@ -33,9 +37,6 @@ static char const *ssconvert_import_encoding = NULL;
static char const *ssconvert_import_id = NULL;
static char const *ssconvert_export_id = NULL;
#ifdef WIN32
#define POPT_STATIC
#endif
struct poptOption
ssconvert_popt_options[] = {
{ NULL, '\0', POPT_ARG_INTL_DOMAIN, (char *)GETTEXT_PACKAGE, 0, NULL, NULL },
......
......@@ -35,15 +35,16 @@
#include <gsf/gsf-output-stdio.h>
#include <string.h>
#include <stdio.h>
#ifdef WIN32
#define POPT_STATIC
#endif
#include <popt.h>
static gboolean ssindex_show_version = FALSE;
static gboolean ssindex_list_mime_types = FALSE;
static gboolean ssindex_run_indexer = FALSE;
static char const *ssindex_import_encoding = NULL;
#ifdef WIN32
#define POPT_STATIC
#endif
const struct poptOption
ssindex_popt_options[] = {
{ NULL, '\0', POPT_ARG_INTL_DOMAIN, (char *)GETTEXT_PACKAGE, 0, NULL, NULL },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment