From 4bb173b297c3ef0723b69d690ae6d2ca00bf7fb2 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 18:20:10 +0800 Subject: [PATCH] build: Remove leftovers of Visual Studio project stuff There are more leftover preconfigured stuff that we ought to remove... --- configure.ac | 2 - gio/Makefile.am | 1 - gio/gnetworking.h.win32 | 81 ------------------------------------- glib/.gitignore | 1 - gmodule/Makefile.am | 1 - gmodule/gmoduleconf.h.win32 | 39 ------------------ 6 files changed, 125 deletions(-) delete mode 100644 gio/gnetworking.h.win32 delete mode 100644 gmodule/gmoduleconf.h.win32 diff --git a/configure.ac b/configure.ac index d2f4067e6..2ab633648 100644 --- a/configure.ac +++ b/configure.ac @@ -3524,8 +3524,6 @@ if false; then AC_CONFIG_FILES([ INSTALL README - config.h.win32 - glib/glibconfig.h.win32 glib/glib.rc gmodule/gmodule.rc gobject/gobject.rc diff --git a/gio/Makefile.am b/gio/Makefile.am index b9ea1a2b9..7c7f247c0 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -787,7 +787,6 @@ EXTRA_DIST += \ gio.rc.in \ gschema.dtd \ gconstructor_as_data.h \ - gnetworking.h.win32 \ $(NULL) BUILT_EXTRA_DIST += \ diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32 deleted file mode 100644 index 1f45dba32..000000000 --- a/gio/gnetworking.h.win32 +++ /dev/null @@ -1,81 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2008-2011 Red Hat, 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 __G_NETWORKING_H__ -#define __G_NETWORKING_H__ - -#include - -#ifdef G_OS_WIN32 - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#include -#include -#include -#include -#include -#include -#undef interface - -#else /* !G_OS_WIN32 */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifndef T_SRV -#define T_SRV 33 -#endif - -#ifndef _PATH_RESCONF -#define _PATH_RESCONF "/etc/resolv.conf" -#endif - -#ifndef CMSG_LEN -/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on - * some older platforms. - */ -#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len)) - -/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR() - * adds. We overestimate here. - */ -#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1)) -#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr) -#endif -#endif - -G_BEGIN_DECLS - -GLIB_AVAILABLE_IN_2_36 -void g_networking_init (void); - -G_END_DECLS - -#endif /* __G_NETWORKING_H__ */ diff --git a/glib/.gitignore b/glib/.gitignore index 17142a60c..f79e130df 100644 --- a/glib/.gitignore +++ b/glib/.gitignore @@ -1,5 +1,4 @@ glibconfig.h -glibconfig.h.win32 glibconfig-stamp gtester diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 00e0e68d4..26578dd0c 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -15,7 +15,6 @@ EXTRA_DIST += \ gmodule-dyld.c \ gmodule-win32.c \ gmodule-ar.c \ - gmoduleconf.h.win32 \ gmodule.rc.in BUILT_EXTRA_DIST += \ diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32 deleted file mode 100644 index 478365382..000000000 --- a/gmodule/gmoduleconf.h.win32 +++ /dev/null @@ -1,39 +0,0 @@ -/* GMODULE - GLIB wrapper code for dynamic module loading - * Copyright (C) 1998 Tim Janik - * - * 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 __G_MODULE_CONF_H__ -#define __G_MODULE_CONF_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define G_MODULE_IMPL_NONE 0 -#define G_MODULE_IMPL_DL 1 -#define G_MODULE_IMPL_WIN32 3 -#define G_MODULE_IMPL_DYLD 6 - -#define G_MODULE_IMPL G_MODULE_IMPL_WIN32 -#undef G_MODULE_HAVE_DLERROR - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __G_MODULE_CONF_H__ */