[AOLSERVER-COMMITS] aolserver/include ns.h, 1.94, 1.94.2.1 ns.mak.in, 1.5, 1.5.6.1 nsthread.h, 1.32, 1.32.2.1

[Jeff Rogers]

Update of /cvsroot/aolserver/aolserver/include
In directory vz-cvs-4.sog:/tmp/cvs-serv20288/include

Modified Files:
Tag: aolserver_v45_r2
ns.h ns.mak.in nsthread.h
Log Message:
merge trunk changes to release branch

Index: ns.mak.in
===================================================================
RCS file: /cvsroot/aolserver/aolserver/include/ns.mak.in,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** ns.mak.in 27 Jun 2006 17:00:55 -0000 1.5
--- ns.mak.in 18 Sep 2012 00:29:40 -0000 1.5.6.1
***************
*** 162,165 ****
--- 162,166 ----
MODOBJ = $(MOD)_modinit.o
MODOBJS += $(MODOBJ)
+ DEFS += -DNS_MODINIT=$(MODINIT)
endif
endif

Index: ns.h
===================================================================
RCS file: /cvsroot/aolserver/aolserver/include/ns.h,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -C2 -d -r1.94 -r1.94.2.1
*** ns.h 26 Oct 2011 06:20:15 -0000 1.94
--- ns.h 18 Sep 2012 00:29:40 -0000 1.94.2.1
***************
*** 237,241 ****
#define INVALID_SOCKET (-1)
#define SOCKET_ERROR (-1)
- #define NS_EXPORT
#define ns_sockclose close
#define ns_socknbclose close
--- 237,240 ----
***************
*** 1396,1398 ****
--- 1395,1402 ----
#endif

+ /* Module init proc automatic export */
+ #ifdef NS_MODINIT
+ NS_EXPORT Ns_ModuleInitProc NS_MODINIT;
+ #endif
+
#endif /* NS_H */

Index: nsthread.h
===================================================================
RCS file: /cvsroot/aolserver/aolserver/include/nsthread.h,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** nsthread.h 24 Dec 2009 19:50:06 -0000 1.32
--- nsthread.h 18 Sep 2012 00:29:40 -0000 1.32.2.1
***************
*** 47,51 ****
#define NS_IMPORT __declspec(dllimport)
#else
! #define NS_EXPORT
#define NS_IMPORT
#ifndef _REENTRANT
--- 47,55 ----
#define NS_IMPORT __declspec(dllimport)
#else
! # if __GNUC__ >= 4
! # define NS_EXPORT __attribute__ ((visibility ("default")))
! # else
! # define NS_EXPORT
! # endif /* __GNUC__ >= 4 */
#define NS_IMPORT
#ifndef _REENTRANT


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
aolserver-commits mailing list
aolserve...@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/aolserver-commits