--- deliantra/server/include/dynbuf.h	2009/11/09 03:08:24	1.28
+++ deliantra/server/include/dynbuf.h	2018/12/05 21:18:37	1.40
@@ -1,24 +1,25 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -28,7 +29,7 @@
 #include <cstring>
 #include <cassert>
 
-#include "compiler.h"
+#include "ecb.h"
 #include "util.h"
 #include "shstr.h"
 
@@ -86,7 +87,7 @@
 
   void linearise (void *data);
   char *linearise () // does not 0-terminate(!)
-  { 
+  {
     return first->next ? _linearise () : first->data;
   }
 
@@ -95,14 +96,20 @@
   // make sure we have "size" extra room
   char *force (int size)
   {
-    if (expect_false (ptr + size > end))
+    if (ecb_expect_false (ptr + size > end))
       reserve (size);
 
-    assume (ptr + size <= end);
+    ecb_assume (ptr + size <= end);
 
     return ptr;
   }
 
+  // used for force + alloc combo
+  void alloc (char *p)
+  {
+    ptr = p;
+  }
+
   // allocate size bytes and return pointer to them (caller must force())
   char *falloc (int size)
   {
@@ -186,7 +193,7 @@
   dynbuf_text &operator << (uint32 i) { add (sint64 (i)); return *this; }
   dynbuf_text &operator << (uint64 i) { add (sint64 (i)); return *this; }
 
-  void printf (const char *format, ...) attribute ((format (printf, 2, 3)));
+  void printf (const char *format, ...) ecb_attribute ((format (printf, 2, 3)));
   void vprintf (const char *format, va_list ap);
 
   void add_abilities (const char *name, uint32 abilities);