From d1a5acc22910f5136e159b5401e68f80852d3630 Mon Sep 17 00:00:00 2001 From: Monsta Date: Tue, 25 Aug 2015 16:36:48 +0300 Subject: drop support for win32 --- libmateweather/Makefile.am | 9 +--- libmateweather/mateweather-win32.c | 100 ------------------------------------- libmateweather/mateweather-win32.h | 43 ---------------- libmateweather/weather-priv.h | 4 -- 4 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 libmateweather/mateweather-win32.c delete mode 100644 libmateweather/mateweather-win32.h (limited to 'libmateweather') diff --git a/libmateweather/Makefile.am b/libmateweather/Makefile.am index b626bcf..b97a4f7 100644 --- a/libmateweather/Makefile.am +++ b/libmateweather/Makefile.am @@ -20,7 +20,7 @@ libmateweatherinc_HEADERS = \ $(mateweather_new_headers) \ mateweather-enum-types.h -noinst_HEADERS = weather-priv.h mateweather-win32.h +noinst_HEADERS = weather-priv.h libmateweather_la_SOURCES = \ weather.c weather.h weather-priv.h \ @@ -32,17 +32,10 @@ libmateweather_la_SOURCES = \ mateweather-xml.c mateweather-xml.h \ mateweather-location.c mateweather-location.h \ mateweather-timezone.c mateweather-timezone.h \ - mateweather-win32.h \ location-entry.c location-entry.h \ timezone-menu.c timezone-menu.h \ parser.c parser.h -if OS_WIN32 -libmateweather_la_SOURCES += mateweather-win32.c -else -EXTRA_libmateweather_la_SOURCES = mateweather-win32.c -endif - libmateweather_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(LIBXML_CFLAGS) \ diff --git a/libmateweather/mateweather-win32.c b/libmateweather/mateweather-win32.c deleted file mode 100644 index 1d3e197..0000000 --- a/libmateweather/mateweather-win32.c +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* mateweather-win32.c - Win32 portability - * - * Copyright 2008, Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see - * . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#ifdef G_OS_WIN32 - -#include - -#include "mateweather-win32.h" - -static HMODULE dll = NULL; - -/* Prototype first to silence gcc warning */ -BOOL WINAPI -DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved); - -BOOL WINAPI -DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - dll = hinstDLL; - - return TRUE; -} - -char * -_mateweather_win32_get_zoneinfo_dir (void) -{ - static char *retval = NULL; - char *root; - - if (retval) - return retval; - - root = g_win32_get_package_installation_directory_of_module (dll); - retval = g_build_filename (root, "share/zoneinfo", NULL); - g_free (root); - - return retval; -} - -char * -_mateweather_win32_get_locale_dir (void) -{ - static char *retval = NULL; - char *root; - - if (retval) - return retval; - - root = g_win32_get_package_installation_directory_of_module (dll); - retval = g_build_filename (root, "share/locale", NULL); - g_free (root); - - return retval; -} - -char * -_mateweather_win32_get_xml_location_dir (void) -{ - static char *retval = NULL; - char *root; - - if (retval) - return retval; - - root = g_win32_get_package_installation_directory_of_module (dll); - retval = g_build_filename (root, "share/libmateweather", NULL); - g_free (root); - - return retval; -} - -#endif diff --git a/libmateweather/mateweather-win32.h b/libmateweather/mateweather-win32.h deleted file mode 100644 index 184ac4f..0000000 --- a/libmateweather/mateweather-win32.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* mateweather-win32.h - Win32 portability - * - * Copyright 2008, Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see - * . - */ - -#ifndef __MATEWEATHER_WIN32_H__ -#define __MATEWEATHER_WIN32_H__ - -#ifdef _WIN32 - -#define localtime_r(t,tmp) (localtime (t) ? ((*tmp) = *localtime (t), tmp) : NULL) - -#undef MATELOCALEDIR -#define MATELOCALEDIR _mateweather_win32_get_locale_dir () - -#undef ZONEINFO_DIR -#define ZONEINFO_DIR _mateweather_win32_get_zoneinfo_dir () - -#undef MATEWEATHER_XML_LOCATION_DIR -#define MATEWEATHER_XML_LOCATION_DIR _mateweather_win32_get_xml_location_dir () - -char *_mateweather_win32_get_locale_dir (void); -char *_mateweather_win32_get_zoneinfo_dir (void); -char *_mateweather_win32_get_xml_location_dir (void); - -#endif - -#endif /* __MATEWEATHER_WIN32_H__ */ diff --git a/libmateweather/weather-priv.h b/libmateweather/weather-priv.h index e602f7b..c0c0944 100644 --- a/libmateweather/weather-priv.h +++ b/libmateweather/weather-priv.h @@ -29,10 +29,6 @@ #include "weather.h" #include "mateweather-location.h" -#ifdef _WIN32 -#include "mateweather-win32.h" -#endif - const char *mateweather_gettext (const char *str) G_GNUC_FORMAT (1); const char *mateweather_dpgettext (const char *context, const char *str) G_GNUC_FORMAT (2); #define _(str) (mateweather_gettext (str)) -- cgit v1.2.1