diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-11-24 18:53:03 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-11-24 18:53:03 +0000 |
| commit | d4a5eab30b986ac01c11a6538e818301f029ea5e (patch) | |
| tree | 324697851a511e35ce987ca6af9ed5c89f88be74 /gmodule | |
| parent | bad5376d451785cce680fdafee5102cad7c298c3 (diff) | |
*/.cvsignore: Add various Win32 related file types.
2001-11-24 Tor Lillqvist <tml@iki.fi>
*/.cvsignore: Add various Win32 related file types.
gmodule:
2001-11-24 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Remove rule for testgmodule.exp, too.
2001-11-22 Tor Lillqvist <tml@iki.fi>
* gmodule-win32.c: Current w32api headers do include tlhelp32.h,
so no need to have an extract from it here.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/.cvsignore | 4 | ||||
| -rw-r--r-- | gmodule/ChangeLog | 9 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 3 | ||||
| -rw-r--r-- | gmodule/gmodule-win32.c | 26 |
4 files changed, 13 insertions, 29 deletions
diff --git a/gmodule/.cvsignore b/gmodule/.cvsignore index fd6051b81..7aa825475 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 2ca2ba6e8..298a07b01 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,12 @@ +2001-11-24 Tor Lillqvist <tml@iki.fi> + + * Makefile.am: Remove rule for testgmodule.exp, too. + +2001-11-22 Tor Lillqvist <tml@iki.fi> + + * 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 <otaylor@redhat.com> * Makefile.am makefile.msc.in makefile.mingw.in: Remove diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index e5ef64a63..fe1f7a742 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 a738b0134..5fdf92886 100644 --- a/gmodule/gmodule-win32.c +++ b/gmodule/gmodule-win32.c @@ -34,38 +34,12 @@ #include <stdio.h> #include <windows.h> -#ifdef __MSVC__ #include <tlhelp32.h> -#else #ifdef G_WITH_CYGWIN #include <sys/cygwin.h> #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) { |