[enet-cvs] CVS: enet/include/enet enet.h,1.7,1.8

[Brian Hook (ENet CVS)]

Update of /home/enet/cvsroot/enet/include/enet
In directory sferik:/tmp/cvs-serv11000/include/enet

Modified Files:
	enet.h 
Log Message:
Added ENET_API and ENET_DLL changes.  All functions flagged as ENET_API are considered parts of the public API.  The C source files define ENET_BUILDING_LIB before including the enet.h.  ENET_DLL is only relevant on Win32.

Index: enet.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/enet.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- enet.h	2003/03/08 23:57:25	1.7
+++ enet.h	2003/03/09 02:17:05	1.8
@@ -22,6 +22,24 @@
 #include "unix.h"
 #endif
 
+#ifdef ENET_API
+#undef ENET_API
+#endif
+
+#if defined WIN32
+#if defined ENET_DLL
+#if defined ENET_BUILDING_LIB
+#define ENET_API __declspec( dllexport )
+#else
+#define ENET_API __declspec( dllimport )
+#endif /* ENET_BUILDING_LIB */
+#endif /* ENET_DLL */
+#endif /* WIN32 */
+
+#ifndef ENET_API
+#define ENET_API
+#endif
+
 typedef enum
 {
    ENET_SOCKET_TYPE_STREAM   = 1,
@@ -298,14 +316,13 @@
   Initializes ENet globally.  Must be called prior to using any functions in
   ENet.
   @returns 0 on success, < 0 on failure
-  @todo Must these be bracketing?
 */
-extern int enet_initialize (void);
+ENET_API int enet_initialize (void);
 /** 
   Shuts down ENet globally.  Should be called when a program that has
   initialized ENet exits.
 */
-extern void enet_deinitialize (void);
+ENET_API void enet_deinitialize (void);
 
 /** @} */
 
@@ -314,14 +331,12 @@
 /**
   Returns the wall-time in milliseconds.  Its initial value is unspecified
   unless otherwise set.
-  @ingroup private
   */
-extern enet_uint32 enet_time_get (void);
+ENET_API enet_uint32 enet_time_get (void);
 /**
   Sets the current wall-time in milliseconds.
-  @ingroup private
   */
-extern void enet_time_set (enet_uint32);
+ENET_API void enet_time_set (enet_uint32);
 
 /** @defgroup socket ENet socket functions
     @{
@@ -362,25 +377,25 @@
 
 /** @} */
 
-extern ENetPacket * enet_packet_create (const void *dataContents, size_t dataLength, enet_uint32 flags);
-extern void         enet_packet_destroy (ENetPacket *packet );
-extern int          enet_packet_resize  (ENetPacket *packet, size_t dataLength );
-
-extern ENetHost * enet_host_create (const ENetAddress *address, size_t peerCount, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth );
-extern void       enet_host_destroy (ENetHost *host );
-extern ENetPeer * enet_host_connect (ENetHost *host, const ENetAddress *address, size_t channelCount );
-extern int        enet_host_service (ENetHost *, ENetEvent *, enet_uint32);
-extern void       enet_host_flush (ENetHost *);
-extern void       enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *);
-extern void       enet_host_bandwidth_limit (ENetHost *, enet_uint32, enet_uint32);
-extern void       enet_host_bandwidth_throttle (ENetHost *);
-
-extern int                   enet_peer_send (ENetPeer *, enet_uint8, ENetPacket *);
-extern ENetPacket *          enet_peer_receive (ENetPeer *, enet_uint8);
-extern void                  enet_peer_ping (ENetPeer *);
-extern void                  enet_peer_reset (ENetPeer *);
-extern void                  enet_peer_disconnect (ENetPeer *);
-extern void                  enet_peer_throttle_configure (ENetPeer *, enet_uint32, enet_uint32, enet_uint32);
+ENET_API ENetPacket * enet_packet_create (const void *dataContents, size_t dataLength, enet_uint32 flags);
+ENET_API void         enet_packet_destroy (ENetPacket *packet );
+ENET_API int          enet_packet_resize  (ENetPacket *packet, size_t dataLength );
+
+ENET_API ENetHost * enet_host_create (const ENetAddress *address, size_t peerCount, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth );
+ENET_API void       enet_host_destroy (ENetHost *host );
+ENET_API ENetPeer * enet_host_connect (ENetHost *host, const ENetAddress *address, size_t channelCount );
+ENET_API int        enet_host_service (ENetHost *, ENetEvent *, enet_uint32);
+ENET_API void       enet_host_flush (ENetHost *);
+ENET_API void       enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *);
+ENET_API void       enet_host_bandwidth_limit (ENetHost *, enet_uint32, enet_uint32);
+extern   void       enet_host_bandwidth_throttle (ENetHost *);
+
+ENET_API int                 enet_peer_send (ENetPeer *, enet_uint8, ENetPacket *);
+ENET_API ENetPacket *        enet_peer_receive (ENetPeer *, enet_uint8);
+ENET_API void                enet_peer_ping (ENetPeer *);
+ENET_API void                enet_peer_reset (ENetPeer *);
+ENET_API void                enet_peer_disconnect (ENetPeer *);
+ENET_API void                enet_peer_throttle_configure (ENetPeer *, enet_uint32, enet_uint32, enet_uint32);
 extern int                   enet_peer_throttle (ENetPeer *, enet_uint32);
 extern ENetOutgoingCommand * enet_peer_queue_outgoing_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32, enet_uint16);
 extern ENetIncomingCommand * enet_peer_queue_incoming_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32);