Revision: 57093
http://sourceforge.net/p/brlcad/code/57093
Author: brlcad
Date: 2013-08-23 04:42:10 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
similarly remove PKG_EXTERN, no longer pre ansi supporting
Modified Paths:
--------------
brlcad/trunk/include/pkg.h
Modified: brlcad/trunk/include/pkg.h
===================================================================
--- brlcad/trunk/include/pkg.h 2013-08-23 04:39:36 UTC (rev 57092)
+++ brlcad/trunk/include/pkg.h 2013-08-23 04:42:10 UTC (rev 57093)
@@ -50,7 +50,6 @@
* It is vital that the argument list given for "args" be enclosed
* in parens.
*/
-#define PKG_EXTERN(type_and_name, args) extern type_and_name args
#define PKG_ARGS(args) args
@@ -125,19 +124,19 @@
*
* Returns PKC_ERROR on error.
*/
-PKG_EXPORT PKG_EXTERN(struct pkg_conn *pkg_open, (const char *host, const char
*service, const char *protocol, const char *username, const char *passwd, const
struct pkg_switch* switchp, pkg_errlog errlog));
+PKG_EXPORT extern struct pkg_conn *pkg_open(const char *host, const char
*service, const char *protocol, const char *username, const char *passwd, const
struct pkg_switch* switchp, pkg_errlog errlog);
/**
* Close a network connection.
*
* Gracefully release the connection block and close the connection.
*/
-PKG_EXPORT PKG_EXTERN(void pkg_close, (struct pkg_conn* pc));
+PKG_EXPORT extern void pkg_close(struct pkg_conn* pc);
/**
*
*/
-PKG_EXPORT PKG_EXTERN(int pkg_process, (struct pkg_conn *));
+PKG_EXPORT extern int pkg_process(struct pkg_conn *);
/**
* Suck all data from the operating system into the internal buffer.
@@ -165,7 +164,7 @@
* 0 on EOF
* 1 success
*/
-PKG_EXPORT PKG_EXTERN(int pkg_suckin, (struct pkg_conn *));
+PKG_EXPORT extern int pkg_suckin(struct pkg_conn *);
/**
* Send a message on the connection.
@@ -180,7 +179,7 @@
*
* Returns number of bytes of user data actually sent.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_send, (int type, const char *buf, size_t len,
struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_send(int type, const char *buf, size_t len, struct
pkg_conn* pc);
/**
* Send a two part message on the connection.
@@ -188,7 +187,7 @@
* Exactly like pkg_send, except user's data is located in two
* disjoint buffers, rather than one. Fiendishly useful!
*/
-PKG_EXPORT PKG_EXTERN(int pkg_2send, (int type, const char *buf1, size_t len1,
const char *buf2, size_t len2, struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_2send(int type, const char *buf1, size_t len1, const
char *buf2, size_t len2, struct pkg_conn* pc);
/**
* Send a message that doesn't need a push.
@@ -202,7 +201,7 @@
*
* Returns number of bytes of user data actually sent (or queued).
*/
-PKG_EXPORT PKG_EXTERN(int pkg_stream, (int type, const char *buf, size_t len,
struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_stream(int type, const char *buf, size_t len, struct
pkg_conn* pc);
/**
* Empty the stream buffer of any queued messages.
@@ -211,7 +210,7 @@
*
* Returns < 0 on failure, else number of bytes sent.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_flush, (struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_flush(struct pkg_conn* pc);
/**
* Wait for a specific msg, user buf, processing others.
@@ -223,7 +222,7 @@
*
* Returns the length of the message actually received, or -1 on error.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_waitfor, (int type, char *buf, size_t len,
struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_waitfor(int type, char *buf, size_t len, struct
pkg_conn* pc);
/**
* Wait for specific msg, malloc buf, processing others.
@@ -238,7 +237,7 @@
*
* Returns pointer to message buffer, or NULL.
*/
-PKG_EXPORT PKG_EXTERN(char *pkg_bwaitfor, (int type, struct pkg_conn* pc));
+PKG_EXPORT extern char *pkg_bwaitfor(int type, struct pkg_conn* pc);
/**
* Wait until a full message has been read.
@@ -256,7 +255,7 @@
* Control returns to the caller after one full message is processed.
* Returns -1 on error, etc.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_block, (struct pkg_conn* pc));
+PKG_EXPORT extern int pkg_block(struct pkg_conn* pc);
/**
* Become a transient network server
@@ -268,7 +267,7 @@
*
* Returns PKC_ERROR or a pointer to a pkg_conn structure.
*/
-PKG_EXPORT PKG_EXTERN(struct pkg_conn *pkg_transerver, (const struct
pkg_switch* switchp, pkg_errlog errlog));
+PKG_EXPORT extern struct pkg_conn *pkg_transerver(const struct pkg_switch*
switchp, pkg_errlog errlog);
/**
* Create a network server, and listen for connection.
@@ -279,7 +278,7 @@
*
* Returns fd to listen on (>=0), -1 on error.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_permserver, (const char *service, const char
*protocol, int backlog, pkg_errlog));
+PKG_EXPORT extern int pkg_permserver(const char *service, const char
*protocol, int backlog, pkg_errlog);
/**
* Create network server from IP address, and listen for connection.
@@ -290,7 +289,7 @@
*
* Returns fd to listen on (>=0), -1 on error.
*/
-PKG_EXPORT PKG_EXTERN(int pkg_permserver_ip, (const char *ipOrHostname, const
char *service, const char *protocol, int backlog, pkg_errlog errlog));
+PKG_EXPORT extern int pkg_permserver_ip(const char *ipOrHostname, const char
*service, const char *protocol, int backlog, pkg_errlog errlog);
/**
* As permanent network server, accept a new connection
@@ -304,7 +303,7 @@
* PKC_NULL accept would block, try again later
* PKC_ERROR fatal error
*/
-PKG_EXPORT PKG_EXTERN(struct pkg_conn *pkg_getclient, (int fd, const struct
pkg_switch *switchp, pkg_errlog errlog, int nodelay));
+PKG_EXPORT extern struct pkg_conn *pkg_getclient(int fd, const struct
pkg_switch *switchp, pkg_errlog errlog, int nodelay);
/****************************
@@ -314,28 +313,28 @@
/**
* Get a 16-bit short from a char[2] array
*/
-PKG_EXPORT PKG_EXTERN(unsigned short pkg_gshort, (char *buf));
+PKG_EXPORT extern unsigned short pkg_gshort(char *buf);
/**
* Get a 32-bit long from a char[4] array
*/
-PKG_EXPORT PKG_EXTERN(unsigned long pkg_glong, (char *buf));
+PKG_EXPORT extern unsigned long pkg_glong(char *buf);
/**
* Put a 16-bit short into a char[2] array
*/
-PKG_EXPORT PKG_EXTERN(char *pkg_pshort, (char *buf, unsigned short s));
+PKG_EXPORT extern char *pkg_pshort(char *buf, unsigned short s);
/**
* Put a 32-bit long into a char[4] array
*/
-PKG_EXPORT PKG_EXTERN(char *pkg_plong, (char *buf, unsigned long l));
+PKG_EXPORT extern char *pkg_plong(char *buf, unsigned long l);
/**
* returns a human-readable string describing this version of the
* LIBPKG library.
*/
-PKG_EXPORT PKG_EXTERN(const char *pkg_version, (void));
+PKG_EXPORT extern const char *pkg_version(void);
#ifdef __cplusplus
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
