Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win32
mingw32-silc-toolkit
silc-toolkit-1.1.10-windows.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File silc-toolkit-1.1.10-windows.patch of Package mingw32-silc-toolkit
--- silc-toolkit-1.1.10/configure.ac 2009-08-07 13:51:30.000000000 +0200 +++ silc-toolkit-1.1.10/configure.ac 2013-04-18 08:40:28.116075646 +0200 @@ -604,7 +604,7 @@ # XXX These needs to be changed as more supported platforms appear. # XXX This probably needs to be made platform dependant check. # -sim_support=false +sim_support=true AC_MSG_CHECKING(for SIM support) AC_MSG_RESULT() AC_CHECK_HEADERS(dlfcn.h, @@ -1213,7 +1213,6 @@ AC_MSG_RESULT(yes) AC_DEFINE([SILC_WIN32], [], [SILC_WIN32]) win32_support=true - CFLAGS="-mno-cygwin $CFLAGS" LIBS="$LIBS -lwsock32" ], [ --- silc-toolkit-1.1.10/includes/silcwin32.h 2009-08-07 13:51:07.000000000 +0200 +++ silc-toolkit-1.1.10/includes/silcwin32.h 2013-04-18 08:43:28.647770970 +0200 @@ -71,7 +71,7 @@ #undef sleep #define sleep(x) Sleep((x) * 1000) -#if _MSC_VER < 1300 +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) #define SetWindowLongPtr SetWindowLong #define GetWindowLongPtr GetWindowLong #endif /* _MSC_VER < 1300 */ --- silc-toolkit-1.1.10/lib/Makefile.am 2009-08-07 13:51:26.000000000 +0200 +++ silc-toolkit-1.1.10/lib/Makefile.am 2013-04-18 08:46:59.756734771 +0200 @@ -44,9 +44,9 @@ endif if SILC_WIN32 -SILC_LINK_LIBS=$(LIBS) -SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc -SILCSERVER_LIBS=$(LIBS) -lsilc +SILC_LINK_LIBS=$(LIBS) -lregex +SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc -lregex +SILCSERVER_LIBS=$(LIBS) -lsilc -lregex else SILC_LINK_LIBS= SILCCLIENT_LINK_LIBS= @@ -88,7 +88,7 @@ LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@ -libsilcclient.a: +libsilcclient.a: libsilc.a find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) $(LIBTOOL_OPTS) -o libsilcclient.la --- silc-toolkit-1.1.10/lib/silcsim/Makefile.am 2009-08-07 13:51:24.000000000 +0200 +++ silc-toolkit-1.1.10/lib/silcsim/Makefile.am 2009-12-21 14:16:36.000000000 +0100 @@ -48,12 +48,12 @@ endif $(SIM_CIPHER_OBJS): - @if test '!' -f lib$*.la ; then $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so $(srcdir)/$*.sim.so; fi + @if test '!' -f lib$*.la ; then $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS) -avoid-version -no-undefined ../libsilc.la; cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.dll $(srcdir)/$*.sim.dll; fi $(SIM_HASH_OBJS): - @if test '!' -f lib$*.la ; then $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so $(srcdir)/$*.sim.so; fi + @if test '!' -f lib$*.la ; then $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS) -avoid-version -no-undefined ../libsilc.la; cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.dll $(srcdir)/$*.sim.dll; fi -CLEANFILES = *.sim.so *.la +CLEANFILES = *.sim.dll *.la include_HEADERS = silcsim.h silcsimutil.h @@ -64,7 +64,7 @@ # install-data-hook: -mkdir -p $(modulesdir) - -$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.so $(modulesdir)/ + -$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.dll $(modulesdir)/ include $(top_srcdir)/Makefile.defines.in --- silc-toolkit-1.1.10/lib/silcsim/silcsim.c 2009-08-07 13:51:07.000000000 +0200 +++ silc-toolkit-1.1.10/lib/silcsim/silcsim.c 2009-12-21 13:54:50.000000000 +0100 @@ -42,6 +42,9 @@ #include "silc.h" +#ifdef SILC_SIM /* SIM upport enabled */ +#include "silcsim.h" + /* SILC Module (SIM) Context. @@ -74,8 +77,6 @@ int flags; }; -#ifdef SILC_SIM /* SIM upport enabled */ - /* Allocates new SIM context. This is later send to all SIM routines. */ --- silc-toolkit-1.1.10/lib/silcutil/win32/silcwin32schedule.c 2009-08-07 13:51:19.000000000 +0200 +++ silc-toolkit-1.1.10/lib/silcutil/win32/silcwin32schedule.c 2013-04-18 09:59:49.967449095 +0200 @@ -130,7 +130,7 @@ static LRESULT CALLBACK silc_schedule_wnd_proc(HWND hwnd, UINT wMsg, WPARAM wParam, LPARAM lParam) { - SilcSchedule schedule = (SilcSchedule)GetWindowLongPtr(hwnd, GWL_USERDATA); + SilcSchedule schedule = (SilcSchedule)GetWindowLongPtr(hwnd, GWLP_USERDATA); SilcWin32Scheduler internal; SilcUInt32 fd; SilcTaskFd task; @@ -268,7 +268,7 @@ } /* Set the scheduler as the window's context */ - SetWindowLongPtr(internal->window, GWL_USERDATA, (void *)schedule); + SetWindowLongPtr(internal->window, GWLP_USERDATA, (LONG_PTR)schedule); SetWindowPos(internal->window, HWND_BOTTOM, 0, 0, 0, 0, SWP_FRAMECHANGED); internal->wakeup_sema = CreateSemaphore(NULL, 0, 100, NULL);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor