From d4a5eab30b986ac01c11a6538e818301f029ea5e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 24 Nov 2001 18:53:03 +0000 Subject: [PATCH] */.cvsignore: Add various Win32 related file types. 2001-11-24 Tor Lillqvist */.cvsignore: Add various Win32 related file types. gmodule: 2001-11-24 Tor Lillqvist * Makefile.am: Remove rule for testgmodule.exp, too. 2001-11-22 Tor Lillqvist * gmodule-win32.c: Current w32api headers do include tlhelp32.h, so no need to have an extract from it here. --- glib/.cvsignore | 9 +++++++++ gmodule/.cvsignore | 4 ++++ gmodule/ChangeLog | 9 +++++++++ gmodule/Makefile.am | 3 --- gmodule/gmodule-win32.c | 26 -------------------------- gobject/.cvsignore | 5 +++++ gthread/.cvsignore | 5 +++++ tests/.cvsignore | 3 +++ 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/glib/.cvsignore b/glib/.cvsignore index b26fb90..e75868b 100644 --- a/glib/.cvsignore +++ b/glib/.cvsignore @@ -1,10 +1,19 @@ Makefile Makefile.in libglib-1.3.la +makefile.mingw +makefile.msc +glib.rc +gspawn-win32-helper +*-build.stamp *.lo *.obj *.lib *.dll +*.exp +*.ilk +*.pdb +*.res *.exe .deps .libs diff --git a/gmodule/.cvsignore b/gmodule/.cvsignore index fd6051b..7aa8254 100644 --- a/gmodule/.cvsignore +++ b/gmodule/.cvsignore @@ -2,10 +2,14 @@ *.obj *.lib *.dll +*.exp +*.ilk +*.pdb Makefile Makefile.in makefile.msc makefile.mingw +*-build.stamp .deps _libs .libs diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 2ca2ba6..298a07b 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,12 @@ +2001-11-24 Tor Lillqvist + + * Makefile.am: Remove rule for testgmodule.exp, too. + +2001-11-22 Tor Lillqvist + + * gmodule-win32.c: Current w32api headers do include tlhelp32.h, + so no need to have an extract from it here. + Mon Nov 19 16:12:12 2001 Owen Taylor * Makefile.am makefile.msc.in makefile.mingw.in: Remove diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index e5ef64a..fe1f7a7 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -82,9 +82,6 @@ endif gmodule-1.3.lib: libgmodule-1.3.la gmodule.def lib -name:libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@ -testgmodule.exp: testgmodule.o - dlltool --output-exp testgmodule.exp testgmodule.o - gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c index a738b01..5fdf928 100644 --- a/gmodule/gmodule-win32.c +++ b/gmodule/gmodule-win32.c @@ -34,38 +34,12 @@ #include #include -#ifdef __MSVC__ #include -#else #ifdef G_WITH_CYGWIN #include #endif -/* The w32api headers supplied with the mingw gcc don't have - * tlhelp32.h. We really only need the MODULEENTRY32 struct and the - * TH32CS_SNAPMODULE value, so provide them here. - */ - -#define MAX_MODULE_NAME32 255 - -typedef struct -{ - DWORD dwSize; - DWORD th32ModuleID; - DWORD th32ProcessID; - DWORD GlblcntUsage; - DWORD ProccntUsage; - BYTE *modBaseAddr; - DWORD modBaseSize; - HMODULE hModule; - char szModule[MAX_MODULE_NAME32 + 1]; - char szExePath[MAX_PATH]; -} MODULEENTRY32; -#define TH32CS_SNAPMODULE 8 - -#endif - static void set_error (void) { diff --git a/gobject/.cvsignore b/gobject/.cvsignore index 4f6ebe0..954f99c 100644 --- a/gobject/.cvsignore +++ b/gobject/.cvsignore @@ -2,11 +2,16 @@ *.obj *.lib *.dll +*.exp +*.ilk +*.pdb *.exe +*.res Makefile Makefile.in makefile.msc makefile.mingw +*-build.stamp .deps _libs .libs diff --git a/gthread/.cvsignore b/gthread/.cvsignore index 5baf327..ab4cef2 100644 --- a/gthread/.cvsignore +++ b/gthread/.cvsignore @@ -1,5 +1,6 @@ Makefile.in makefile.mingw +*-build.stamp makefile.msc Makefile .deps @@ -8,6 +9,10 @@ Makefile *.obj *.lib *.dll +*.exp +*.res +*.ilk +*.pdb .libs *.la so_locations diff --git a/tests/.cvsignore b/tests/.cvsignore index 5c95c79..fd21fcc 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -2,6 +2,9 @@ *.obj *.lib *.dll +*.exp +*.base +*.res *.exe .deps .libs -- 2.7.4