--- ./app/app_procs.c Mon Apr 30 20:55:35 2001 +++ ../dia-0.88.1/./app/app_procs.c Sun Sep 30 09:53:09 2001 @@ -144,9 +144,9 @@ poptContext poptCtx = NULL; struct poptOption options[] = { - {"export", 'e', POPT_ARG_STRING, &export_file_name, 0, + {"export", 'e', POPT_ARG_STRING, NULL /* &export_file_name */, 0, N_("Export loaded file and exit"), N_("OUTPUT")}, - {"nosplash", 0, POPT_ARG_NONE, &nosplash, 0, + {"nosplash", 0, POPT_ARG_NONE, NULL /* &nosplash */, 0, N_("Don't show the splash screen"), NULL }, #ifndef GNOME {"help", 'h', POPT_ARG_NONE, 0, 1, N_("Show this help message") }, @@ -153,6 +153,11 @@ #endif {(char *) NULL, '\0', 0, NULL, 0} }; +#endif + +#ifdef HAVE_POPT + options[0].arg = &export_file_name; + options[1].arg = &nosplash; #endif gtk_set_locale(); --- ./lib/paper.c Mon Apr 30 20:55:38 2001 +++ ../dia-0.88.1/./lib/paper.c Sun Sep 30 10:40:10 2001 @@ -138,7 +138,7 @@ return name_list; } -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__sgi) /* can't export inlined functions. Shouldn't they be declared as such * in paper.h ? The following is a hack. Isn't there a proper sollution * provided by glib ? --- ./lib/dummy_dep.h Sat May 27 11:29:09 2000 +++ ../dia-0.88.1/./lib/dummy_dep.h Sun Sep 30 00:37:49 2001 @@ -40,7 +40,10 @@ object files will be linked into the app. */ -static void *dummy_dep[] G_GNUC_UNUSED = { +#ifndef __sgi +static +#endif +void *dummy_dep[] G_GNUC_UNUSED = { connection_move_handle, element_update_boundingbox, orthconn_update_data, --- ./lib/plug-ins.c Sun Mar 25 20:05:21 2001 +++ ../dia-0.88.1/./lib/plug-ins.c Sun Sep 30 00:38:14 2001 @@ -49,6 +49,9 @@ #if defined(G_OS_WIN32) || defined(__EMX__) # define PLUG_IN_EXT ".dll" # define PLUG_IN_EXT_LEN 4 +#elif defined(__sgi) +# define PLUG_IN_EXT ".so" +# define PLUG_IN_EXT_LEN 3 #else /* this one should work on any platform where libtool is used to compile dia */ # define PLUG_IN_EXT ".la" --- ./plug-ins/pstricks/render_pstricks.c Sun Mar 25 20:05:23 2001 +++ ../dia-0.88.1/./plug-ins/pstricks/render_pstricks.c Sun Sep 30 00:44:08 2001 @@ -704,7 +704,7 @@ fprintf(renderer->file, "[%i 0 0 %i 0 0]\n", img_width, img_height); fprintf(renderer->file, "{currentfile pix readhexstring pop}\n"); fprintf(renderer->file, "false 3 colorimage\n"); - // fprintf(renderer->file, "\n"); + /* fprintf(renderer->file, "\n"); */ ptr = rgb_data; for (y = 0; y < img_width; y++) { for (x = 0; x < img_height; x++) { --- ./ltconfig Fri Mar 16 06:24:49 2001 +++ ../dia-0.88.1/./ltconfig Sun Sep 30 01:23:41 2001 @@ -1925,8 +1925,8 @@ version_type=irix need_lib_prefix=no need_version=no - soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so${major:+.$major}' + library_names_spec='${libname}${release}.so${versuffix:+.$versuffix} ${libname}${release}.so${major:+.$major} ${libname}${release}.so $libname.so' case "$host_os" in irix5*) libsuff= shlibsuff=