generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable SetGenaCallback call if device is disabled.

Browse Source 
If device is disabled, SetGenaCallback definition is disabled,
but its call remains. A link error will occur in Win32.
This commit is contained in:
Yoichi NAKAYAMA 2012-04-25 00:27:58 +09:00
parent 708ea30806
commit 4d21d45da7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2,6 +2,13 @@
Version 1.6.18 Version 1.6.18
******************************************************************************* *******************************************************************************
2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Disable SetGenaCallback call if device is disabled.
If device is disabled, SetGenaCallback definition is disabled,
but its call remains. A link error will occur in Win32.
2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com> 2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix condition for allocation failure in get_content_type(). Fix condition for allocation failure in get_content_type().

2
upnp/src/api/upnpapi.c
View File

@ -364,9 +364,11 @@ static int UpnpInitPreamble(void)
#endif #endif
#endif /* INCLUDE_DEVICE_APIS */ #endif /* INCLUDE_DEVICE_APIS */
#ifdef INTERNAL_WEB_SERVER
#if EXCLUDE_GENA == 0 #if EXCLUDE_GENA == 0
SetGenaCallback(genaCallback); SetGenaCallback(genaCallback);
#endif #endif
#endif /* INTERNAL_WEB_SERVER */
/* Initialize the SDK timer thread. */ /* Initialize the SDK timer thread. */
retVal = TimerThreadInit( &gTimerThread, &gSendThreadPool ); retVal = TimerThreadInit( &gTimerThread, &gSendThreadPool );