From 6415a3e0127eb4278e0975f0ba280840ceb1ef95 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 13 Jul 2016 16:02:06 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng

---
 src/general.h |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/general.h b/src/general.h
index 393eafe..4eab674 100644
--- a/src/general.h
+++ b/src/general.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _GENERAL_H
 #define _GENERAL_H
 
@@ -256,9 +257,13 @@
 	long int nczmax;
 	long int npoly;
 	long int nmono;
+	long int internal_poly;
 	long int nfil;
 	long int nfono;
 	long int R_nucleus;
+	ts_double R_nucleusX;
+	ts_double R_nucleusY;
+	ts_double R_nucleusZ;
 	long int pswitch;
     long int constvolswitch;
     long int constareaswitch;
@@ -306,6 +311,10 @@
 	ts_int pswitch;
     ts_tape *tape;
 	ts_double R_nucleus;
+	ts_double R_nucleusX;
+	ts_double R_nucleusY;
+	ts_double R_nucleusZ;
+	ts_double nucleus_center[3];
     ts_double area;
 } ts_vesicle;
 
@@ -338,4 +347,11 @@
 #define VTX(n) &(vlist->vtx[n])
 #define VTX_DATA(n) vlist->vtx[n].data
 
+
+/* FOR PID GENERATION ROUTINE */
+#define CPF_CLOEXEC 1
+
+int createPidFile(const char *progName, const char *pidFile, int flags);
+
+int lockRegion(int fd, int type, int whence, int start, int len);
 #endif

--
Gitblit v1.9.3