[teklib-general] teklib: Header generator: linklib generator produced "#ifndef __...
Timm S. Mueller
tmueller at neoscientists.org
Sun Feb 22 18:19:37 CET 2009
details: http://hg.teklib.org/teklib/rev/3de116db3a55
changeset: 254:3de116db3a55
user: Timm S. Mueller <tmueller at neoscientists.org>
date: Wed Feb 18 15:04:55 2009 +0100
description:
Header generator: linklib generator produced "#ifndef __cpluscplus" -
corrected, teklib and string headers regenerated; Exec: interface is now
available via compile-time switch, disabled by default
diffs (truncated from 106 to 100 lines):
diff -r 937992b1d8d8 -r 3de116db3a55 etc/genheader.lua
--- a/etc/genheader.lua Wed Feb 18 14:01:36 2009 +0100
+++ b/etc/genheader.lua Wed Feb 18 15:04:55 2009 +0100
@@ -294,7 +294,7 @@
exit = function(state)
state.out([[
-#ifdef __cpluscplus
+#ifdef __cplusplus
}
#endif
diff -r 937992b1d8d8 -r 3de116db3a55 src/exec/exec_mod.c
--- a/src/exec/exec_mod.c Wed Feb 18 14:01:36 2009 +0100
+++ b/src/exec/exec_mod.c Wed Feb 18 15:04:55 2009 +0100
@@ -44,7 +44,7 @@
exec->texb_Module.tmd_Handle.thn_Hook.thk_Entry = exec_dispatch;
exec->texb_Module.tmd_Version = EXEC_VERSION;
exec->texb_Module.tmd_Revision = EXEC_REVISION;
- exec->texb_Module.tmd_Flags = TMODF_VECTORTABLE | TMODF_QUERYIFACE;
+ exec->texb_Module.tmd_Flags = TMODF_VECTORTABLE;
TInitVectors(&exec->texb_Module, exec_vectors, EXEC_NUMVECTORS);
@@ -53,7 +53,9 @@
((TMFPTR *) exec)[-14] = ((TMFPTR *) exec->texb_HALBase)[-13];
((TMFPTR *) exec)[-15] = ((TMFPTR *) exec->texb_HALBase)[-14];
+ #if defined(ENABLE_EXEC_IFACE)
/* initialize interface: */
+ exec->texb_Module.tmd_Flags |= TMODF_QUERYIFACE;
TInitInterface(&exec->texb_Exec1IFace.IFace,
(struct TModule *) exec, "exec", 1);
exec->texb_Exec1IFace.GetHALBase = ((TAPTR *) exec)[-11];
@@ -118,6 +120,7 @@
exec->texb_Exec1IFace.GetLocalDate = ((TAPTR *) exec)[-75];
exec->texb_Exec1IFace.WaitTime = ((TAPTR *) exec)[-76];
exec->texb_Exec1IFace.WaitDate = ((TAPTR *) exec)[-77];
+ #endif
return TTRUE;
}
@@ -241,6 +244,7 @@
TDESTROY(&TExecBase->texb_BaseMemManager);
TDESTROY(&TExecBase->texb_MsgMemManager);
break;
+ #if defined(ENABLE_EXEC_IFACE)
case TMSG_QUERYIFACE:
{
struct TInterfaceQuery *ifq = obj;
@@ -252,6 +256,7 @@
case TMSG_DROPIFACE:
TDBPRINTF(TDB_WARN,("drop interface: %p\n", obj));
break;
+ #endif
}
return 0;
}
diff -r 937992b1d8d8 -r 3de116db3a55 tek/mod/exec.h
--- a/tek/mod/exec.h Wed Feb 18 14:01:36 2009 +0100
+++ b/tek/mod/exec.h Wed Feb 18 15:04:55 2009 +0100
@@ -11,7 +11,9 @@
*/
#include <tek/exec.h>
+#if defined(ENABLE_EXEC_IFACE)
#include <tek/iface/exec.h>
+#endif
/*****************************************************************************/
/*
@@ -441,8 +443,10 @@
TINT texb_NumTasks;
/* Number of initializing tasks */
TINT texb_NumInitTasks;
+ #if defined(ENABLE_EXEC_IFACE)
/* Public Exec interface version 1: */
struct TExecIFace texb_Exec1IFace;
+ #endif
} TEXECBASE;
/*
diff -r 937992b1d8d8 -r 3de116db3a55 tek/string.h
--- a/tek/string.h Wed Feb 18 14:01:36 2009 +0100
+++ b/tek/string.h Wed Feb 18 15:04:55 2009 +0100
@@ -28,7 +28,7 @@
TLIBAPI TSTRPTR TStrRChr(TSTRPTR s, TINT c);
TLIBAPI TINT TStrToI(TSTRPTR s, TINT *valp);
-#ifdef __cpluscplus
+#ifdef __cplusplus
}
#endif
diff -r 937992b1d8d8 -r 3de116db3a55 tek/teklib.h
--- a/tek/teklib.h Wed Feb 18 14:01:36 2009 +0100
+++ b/tek/teklib.h Wed Feb 18 15:04:55 2009 +0100
@@ -43,7 +43,7 @@
TLIBAPI TBOOL TExtractTime(TTIME *t, TINT *d, TINT *s, TINT *us);
TLIBAPI void TInitInterface(struct TInterface *iface, struct TModule *mod, TSTRPTR name, TUINT16 version);
More information about the teklib-general
mailing list