cppbind.Ghost: clean up a bit

[simgear.git] / simgear / nasal / data.h

diff --git a/simgear/nasal/data.h b/simgear/nasal/data.h
index deb4fbdc194abd2618edb510d3cbbb8b0aef750c..5453d39171e1a4367b6c09478a6a8d0526aa9346 100644 (file)
--- a/simgear/nasal/data.h
+++ b/simgear/nasal/data.h
@@ -96,7 +96,7 @@ struct naObj {
 #define MAX_STR_EMBLEN 15
 struct naStr {
     GC_HEADER;
-    char emblen; /* [0-15], or -1 to indicate "not embedded" */
+    signed char emblen; /* [0-15], or -1 to indicate "not embedded" */
     unsigned int hashcode;
     union {
         unsigned char buf[16];
@@ -160,7 +160,15 @@ struct naFunc {
 
 struct naCCode {
     GC_HEADER;
-    naCFunction fptr;
+    union {
+        naCFunction fptr; //<! pointer to simple callback function. Invalid if
+                          //   fptru is not NULL.
+        struct {
+            void* user_data;
+            void(*destroy)(void*);
+            naCFunctionU fptru;
+        };
+    };
 };
 
 struct naGhost {