OTP-8335 Even more NIF features

1 files changed, 8 insertions, 25 deletions

diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index cdb584b282..489e74d960 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1999-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -65,6 +65,8 @@
 #  error SIZEOF_LONG_LONG mismatch
 #endif
 
+#include "erl_drv_nif.h"
+
 #include <stdlib.h>
 
 #if defined(VXWORKS)
@@ -116,7 +118,7 @@ typedef struct {
 
 #define ERL_DRV_EXTENDED_MARKER		(0xfeeeeeed)
 #define ERL_DRV_EXTENDED_MAJOR_VERSION	1
-#define ERL_DRV_EXTENDED_MINOR_VERSION	4
+#define ERL_DRV_EXTENDED_MINOR_VERSION	5
 
 /*
  * The emulator will refuse to load a driver with different major
@@ -195,22 +197,6 @@ typedef struct {
     unsigned char data[sizeof(void *)*4];
 } ErlDrvMonitor;
 
-
-/*
- * System info
- */
-
-typedef struct {
-    int driver_major_version;
-    int driver_minor_version;
-    char *erts_version;
-    char *otp_release;
-    int thread_support;
-    int smp_support;
-    int async_threads;
-    int scheduler_threads;
-}  ErlDrvSysInfo;
-
 typedef struct {
     unsigned long megasecs;
     unsigned long secs;
@@ -255,9 +241,6 @@ typedef struct ErlDrvCond_ ErlDrvCond;
 typedef struct ErlDrvRWLock_ ErlDrvRWLock;
 typedef int ErlDrvTSDKey;
 
-typedef struct {
-    int suggested_stack_size;
-} ErlDrvThreadOpts;
 
 /*
  *