You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2007/03/19 18:18:40 UTC
svn commit: r520017 - in /tcl/websh/trunk/src/generic: hashutl.c hashutl.h
log.c log.h macros.h paramlist.c paramlist.h web.c web.h webout.h
weboutint.c webutl.c webutl.h
Author: ronnie
Date: Mon Mar 19 10:18:37 2007
New Revision: 520017
URL: http://svn.apache.org/viewvc?view=rev&rev=520017
Log:
- export some additional functions to allow dynamically linked websh.dll in Win32
Modified:
tcl/websh/trunk/src/generic/hashutl.c
tcl/websh/trunk/src/generic/hashutl.h
tcl/websh/trunk/src/generic/log.c
tcl/websh/trunk/src/generic/log.h
tcl/websh/trunk/src/generic/macros.h
tcl/websh/trunk/src/generic/paramlist.c
tcl/websh/trunk/src/generic/paramlist.h
tcl/websh/trunk/src/generic/web.c
tcl/websh/trunk/src/generic/web.h
tcl/websh/trunk/src/generic/webout.h
tcl/websh/trunk/src/generic/weboutint.c
tcl/websh/trunk/src/generic/webutl.c
tcl/websh/trunk/src/generic/webutl.h
Modified: tcl/websh/trunk/src/generic/hashutl.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/hashutl.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/hashutl.c (original)
+++ tcl/websh/trunk/src/generic/hashutl.c Mon Mar 19 10:18:37 2007
@@ -123,7 +123,7 @@
/* ----------------------------------------------------------------------------
* assignIteratorToHashTable -- init iterator
* ------------------------------------------------------------------------- */
-int assignIteratorToHashTable(Tcl_HashTable * hash,
+int __declspec(dllexport) assignIteratorToHashTable(Tcl_HashTable * hash,
HashTableIterator * iterator)
{
@@ -140,7 +140,7 @@
/* ----------------------------------------------------------------------------
* nextFromIterator -- get value from iterator
* ------------------------------------------------------------------------- */
-int nextFromHashIterator(HashTableIterator * iterator)
+int __declspec(dllexport) nextFromHashIterator(HashTableIterator * iterator)
{
if (iterator == NULL)
@@ -157,7 +157,7 @@
/* ----------------------------------------------------------------------------
* keyOfCurrent -- get key for current value of iterator
* ------------------------------------------------------------------------- */
-char *keyOfCurrent(HashTableIterator * iterator)
+char __declspec(dllexport) *keyOfCurrent(HashTableIterator * iterator)
{
if (iterator == NULL)
@@ -172,7 +172,7 @@
/* ----------------------------------------------------------------------------
* valueOfCurrent -- get current value from iterator
* ------------------------------------------------------------------------- */
-ClientData valueOfCurrent(HashTableIterator * iterator)
+ClientData __declspec(dllexport) valueOfCurrent(HashTableIterator * iterator)
{
if (iterator == NULL)
Modified: tcl/websh/trunk/src/generic/hashutl.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/hashutl.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/hashutl.h (original)
+++ tcl/websh/trunk/src/generic/hashutl.h Mon Mar 19 10:18:37 2007
@@ -45,11 +45,11 @@
ClientData removeFromHashTable(Tcl_HashTable * hash, char *key);
ClientData getFromHashTable(Tcl_HashTable * hash, char *key);
-int assignIteratorToHashTable(Tcl_HashTable * hash,
+int __declspec(dllexport) assignIteratorToHashTable(Tcl_HashTable * hash,
HashTableIterator * iterator);
-int nextFromHashIterator(HashTableIterator * iterator);
+int __declspec(dllexport) nextFromHashIterator(HashTableIterator * iterator);
-char *keyOfCurrent(HashTableIterator * iterator);
-ClientData valueOfCurrent(HashTableIterator * iterator);
+char __declspec(dllexport) *keyOfCurrent(HashTableIterator * iterator);
+ClientData __declspec(dllexport) valueOfCurrent(HashTableIterator * iterator);
#endif
Modified: tcl/websh/trunk/src/generic/log.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/log.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/log.c (original)
+++ tcl/websh/trunk/src/generic/log.c Mon Mar 19 10:18:37 2007
@@ -26,7 +26,7 @@
* Init --
* entry point for module weblog of websh3
* ------------------------------------------------------------------------- */
-int log_Init(Tcl_Interp * interp)
+int __declspec(dllexport) log_Init(Tcl_Interp * interp)
{
LogData *logData = NULL;
@@ -951,7 +951,7 @@
/* ----------------------------------------------------------------------------
* createLogPlugIn --
* ------------------------------------------------------------------------- */
-LogPlugIn *createLogPlugIn()
+LogPlugIn __declspec(dllexport) *createLogPlugIn()
{
LogPlugIn *logPlugIn = NULL;
@@ -985,7 +985,7 @@
/* ----------------------------------------------------------------------------
* registerLogPlugIn --
* ------------------------------------------------------------------------- */
-int registerLogPlugIn(Tcl_Interp * interp, char *type, LogPlugIn * logPlugIn)
+int __declspec(dllexport) registerLogPlugIn(Tcl_Interp * interp, char *type, LogPlugIn * logPlugIn)
{
LogData *logData;
@@ -1018,7 +1018,7 @@
* <level> webshell log level
* <msg> message parts (NULL-terminated list)
* ------------------------------------------------------------------------- */
-void LOG_MSG(Tcl_Interp * interp, int flag, char *filename, int linenr,
+void __declspec(dllexport) LOG_MSG(Tcl_Interp * interp, int flag, char *filename, int linenr,
char *cmd, char *level, char *msg, ...)
{
Modified: tcl/websh/trunk/src/generic/log.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/log.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/log.h (original)
+++ tcl/websh/trunk/src/generic/log.h Mon Mar 19 10:18:37 2007
@@ -132,9 +132,9 @@
LogPlugInHandler *handler;
}
LogPlugIn;
-LogPlugIn *createLogPlugIn();
+LogPlugIn __declspec(dllexport) *createLogPlugIn();
int destroyLogPlugIn(void *plugIn, void *dum);
-int registerLogPlugIn(Tcl_Interp * interp, char *type, LogPlugIn * plugIn);
+int __declspec(dllexport) registerLogPlugIn(Tcl_Interp * interp, char *type, LogPlugIn * plugIn);
/* ----------------------------------------------------------------------------
@@ -181,7 +181,7 @@
/* ----------------------------------------------------------------------------
* Tcl interface and commands
* ------------------------------------------------------------------------- */
-int log_Init(Tcl_Interp * interp);
+int __declspec(dllexport) log_Init(Tcl_Interp * interp);
int Web_Log(ClientData clientData,
Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[]);
@@ -227,7 +227,7 @@
LOG_MSG(,0,...) --> don't do this
*/
-void LOG_MSG(Tcl_Interp * interp, int flag, char *filename, int linenr,
+void __declspec(dllexport) LOG_MSG(Tcl_Interp * interp, int flag, char *filename, int linenr,
char *cmd, char *level, char *msg, ...);
#endif
Modified: tcl/websh/trunk/src/generic/macros.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/macros.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/macros.h (original)
+++ tcl/websh/trunk/src/generic/macros.h Mon Mar 19 10:18:37 2007
@@ -28,6 +28,10 @@
# define TCLCONST
#endif
+#ifndef WIN32
+#define __declspec(dllexport)
+#endif
+
#include "log.h"
#define WEBSH "websh"
Modified: tcl/websh/trunk/src/generic/paramlist.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/paramlist.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/paramlist.c (original)
+++ tcl/websh/trunk/src/generic/paramlist.c Mon Mar 19 10:18:37 2007
@@ -110,7 +110,7 @@
* paramListSetAsWhole -- set value to new ListObj with just the given value
* without listifying the element
* ------------------------------------------------------------------------- */
-int paramListSetAsWhole(ParamList * hash, char *key, Tcl_Obj * value)
+int __declspec(dllexport) paramListSetAsWhole(ParamList * hash, char *key, Tcl_Obj * value)
{
Tcl_Obj *existingValue = NULL;
@@ -131,7 +131,7 @@
/* ----------------------------------------------------------------------------
* paramListAdd -- append value to existing ListObj under key
* ------------------------------------------------------------------------- */
-int paramListAdd(ParamList * hash, char *key, Tcl_Obj * value)
+int __declspec(dllexport) paramListAdd(ParamList * hash, char *key, Tcl_Obj * value)
{
Tcl_Obj *existing = NULL;
Modified: tcl/websh/trunk/src/generic/paramlist.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/paramlist.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/paramlist.h (original)
+++ tcl/websh/trunk/src/generic/paramlist.h Mon Mar 19 10:18:37 2007
@@ -25,8 +25,8 @@
Tcl_Obj * key, Tcl_Obj * defaultObj);
int paramListSet(ParamList * hash, char *key, Tcl_Obj * value);
-int paramListSetAsWhole(ParamList * hash, char *key, Tcl_Obj * value);
-int paramListAdd(ParamList * hash, char *key, Tcl_Obj * value);
+int __declspec(dllexport) paramListSetAsWhole(ParamList * hash, char *key, Tcl_Obj * value);
+int __declspec(dllexport) paramListAdd(ParamList * hash, char *key, Tcl_Obj * value);
int paramListDel(ParamList * hash, char *key);
Tcl_Obj *paramListAsListObj(ParamList * hash);
int listObjAsParamList(Tcl_Obj * list, ParamList * hash);
Modified: tcl/websh/trunk/src/generic/web.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/web.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/web.c (original)
+++ tcl/websh/trunk/src/generic/web.c Mon Mar 19 10:18:37 2007
@@ -22,11 +22,7 @@
/* ----------------------------------------------------------------------------
* init --
* ------------------------------------------------------------------------- */
-#ifdef WIN32
int __declspec(dllexport) Websh_Init(Tcl_Interp * interp)
-#else
-int Websh_Init(Tcl_Interp * interp)
-#endif
{
UrlData *urlData;
Modified: tcl/websh/trunk/src/generic/web.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/web.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/web.h (original)
+++ tcl/websh/trunk/src/generic/web.h Mon Mar 19 10:18:37 2007
@@ -32,11 +32,7 @@
#include "filecounter.h"
#include "modwebsh.h"
-#ifdef WIN32
int __declspec(dllexport) Websh_Init(Tcl_Interp * interp);
-#else
-int Websh_Init(Tcl_Interp * interp);
-#endif
int Script_Init(Tcl_Interp * interp);
Modified: tcl/websh/trunk/src/generic/webout.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/webout.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/webout.h (original)
+++ tcl/websh/trunk/src/generic/webout.h Mon Mar 19 10:18:37 2007
@@ -51,7 +51,7 @@
}
ResponseObj;
-ResponseObj *createResponseObj(Tcl_Interp * interp, char *name,
+ResponseObj __declspec(dllexport) *createResponseObj(Tcl_Interp * interp, char *name,
ResponseHeaderHandler * headerHandler);
int destroyResponseObj(ClientData clientData, Tcl_Interp * interp);
Modified: tcl/websh/trunk/src/generic/weboutint.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/weboutint.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/weboutint.c (original)
+++ tcl/websh/trunk/src/generic/weboutint.c Mon Mar 19 10:18:37 2007
@@ -126,7 +126,7 @@
/* ----------------------------------------------------------------------------
* createResponseObj
* ------------------------------------------------------------------------- */
-ResponseObj *createResponseObj(Tcl_Interp * interp, char *channelName,
+ResponseObj __declspec(dllexport) *createResponseObj(Tcl_Interp * interp, char *channelName,
ResponseHeaderHandler * headerHandler)
{
Modified: tcl/websh/trunk/src/generic/webutl.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/webutl.c?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/webutl.c (original)
+++ tcl/websh/trunk/src/generic/webutl.c Mon Mar 19 10:18:37 2007
@@ -21,7 +21,7 @@
* allocAndSet --
* wrapper to Tcl_Alloc for zero-terminated char * (or 8-bit) strings
* ------------------------------------------------------------------------- */
-char *allocAndSet(const char *aString)
+char __declspec(dllexport) *allocAndSet(const char *aString)
{
char *cPtr = NULL;
Modified: tcl/websh/trunk/src/generic/webutl.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/webutl.h?view=diff&rev=520017&r1=520016&r2=520017
==============================================================================
--- tcl/websh/trunk/src/generic/webutl.h (original)
+++ tcl/websh/trunk/src/generic/webutl.h Mon Mar 19 10:18:37 2007
@@ -22,7 +22,7 @@
#ifndef WEBUTL_H
#define WEBUTL_H
-char *allocAndSet(const char *aString);
+char __declspec(dllexport) *allocAndSet(const char *aString);
char *allocAndSetN(const char *aString, int N);
char *strchrchr(const char *cs, const char c0, const char c1, char *tag);
char *myUtfStrStr(const char *s1, const char *s2);
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org