debase-ruby_core_source 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294cd72e2168d625b5932bdd330856c271cb0657123d51f7069b8ef880d5bf63
-  data.tar.gz: 63670f87b464736bca2f1e1dbeca3403e3fa88cf05daa4792980be8e481a1511
+  metadata.gz: b2aa26f507b3b2cd516c1fb0b3f99e766de9f6a2a323757f0053932419f8f177
+  data.tar.gz: 640b5f6c13a9a47812cdbf927cbe3445ec5214d6d862481e8933c71994de1189
 SHA512:
-  metadata.gz: d19b9a31e40fcb1d29c96aad228e34ed996834c28a0192b18369e4ed444fce45de44d7a2ca845eb6518299a8b13126c056e3f68087f2db2fc9380a2d41f26430
-  data.tar.gz: 8b2996c2116e0c01641dea3a36c210d361f4f07fb8f2de6dc95d6bc4b34bf05f40c98155d2986651316244bd0453c2415b0d12659b7aca04273c777a08dfdf79
+  metadata.gz: ea756a130074c66510d11fba61ba705f6969dbda3c28dc13cb0fbf4b5347d9091d75ea576cdb4d928eab5314688be620b871489939093351d807d7bfc402c2b5
+  data.tar.gz: d835c83bdca8cfba3cf19ea6f0c3ac3a0065a1d0d6a1dc8c4ecb749af0eeb61bedbc2df926f5e8b4f31a76b0d00142416dc3283cd731180312ab70717bb4f210

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.10.10](https://github.com/ruby-debug/debase-ruby_core_source/compare/v0.10.9...v0.10.10)
+
+* removed ruby 2.7.0 preview sources to avoid falling back on them for release versions
+
 ## [0.10.9](https://github.com/os97673/debase-ruby_core_source/compare/v0.10.8...v0.10.9)
 
 * ruby 2.7.0 added (contributed by [ViugiNick](https://github.com/ViugiNick))

data/README.md

@@ -1,7 +1,7 @@
 ## Description
 Fork of [debugger-ruby\_core\_source](https://github.com/cldwalker/debugger-ruby_core_source)
 that uses included Ruby headers (\*.h and \*.inc) instead of downloading
-them. Used by [debase](http://github.com/denofevil/debase).
+them. Used by [debase](http://github.com/ruby-debug/debase).
 Only ruby >= 2.0.0 is supported (debase doesn't work for older rubies)
 
 ## Usage

data/debase-ruby_core_source.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Debase::RubyCoreSource::VERSION
   s.authors = ["Mark Moseley", "Gabriel Horner", "JetBrains RubyMine Team"]
   s.email = "os97673@gmail.com"
-  s.homepage = "http://github.com/os97673/debase-ruby_core_source"
+  s.homepage = "http://github.com/ruby-debug/debase-ruby_core_source"
   s.summary = %q{Provide Ruby core source files}
   s.description = %q{Provide Ruby core source files for C extensions that need them.}
   s.license = "MIT"
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.0'
   s.extra_rdoc_files = [ "README.md"]
   s.files = `git ls-files`.split("\n")
-  s.add_development_dependency "archive-tar-minitar", ">= 0.5.2"
+  s.add_development_dependency "archive-tar-minitar", "~> 0.8"
   s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'minitar-cli', '~> 0.8'
 end

data/lib/debase/ruby_core_source.rb

@@ -8,8 +8,6 @@ module Debase
         # Revision can be found at `revision.h` of ruby sources.
         # Format of this hash:
         # <RUBY_REVISION> => '<sources directory name>', e.g. `61243 => 'ruby-2.5.0-rc1'`
-        '02aadf1032d71a3f81653a955f2635c8853b0aca' => 'ruby-2.7.0-preview2',
-        'b563439274a402e33541f5695b1bfd4ac1085638' => 'ruby-2.7.0-preview3',
     }
 
     def self.create_makefile_with_core(hdrs, name)

data/lib/debase/ruby_core_source/version.rb

@@ -1,5 +1,5 @@
 module Debase
   module RubyCoreSource
-   VERSION = '0.10.9'
+   VERSION = '0.10.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debase-ruby_core_source
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Mark Moseley
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: minitar-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Provide Ruby core source files for C extensions that need them.
 email: os97673@gmail.com
 executables: []
@@ -2285,113 +2299,8 @@ files:
 - lib/debase/ruby_core_source/ruby-2.7.0-p0/vm_insnhelper.h
 - lib/debase/ruby_core_source/ruby-2.7.0-p0/vm_opts.h
 - lib/debase/ruby_core_source/ruby-2.7.0-p0/vmtc.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/addr2line.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/build_assert/build_assert.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/check_type/check_type.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/container_of/container_of.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/list/list.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/str/str.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/constant.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/debug_counter.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/dln.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/encindex.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/eval_intern.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/gc.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/hrtime.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/id.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/id_table.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/insns.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/insns_info.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/internal.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/iseq.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/known_errors.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/method.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/mjit.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/mjit_compile.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/node.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/node_name.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/opt_sc.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/optinsn.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/optunifs.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/parse.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/probes_helper.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/regenc.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/regint.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/regparse.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/revision.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ruby_assert.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/ruby_atomic.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/siphash.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/symbol.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/thread_pthread.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/thread_win32.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/timev.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/transcode_data.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/transient_heap.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/version.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_call_iseq_optimized.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_core.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_debug.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_exec.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_insnhelper.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vm_opts.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview2/vmtc.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/addr2line.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/builtin.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ccan/build_assert/build_assert.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ccan/check_type/check_type.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ccan/container_of/container_of.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ccan/list/list.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ccan/str/str.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/constant.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/debug_counter.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/dln.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/encindex.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/eval_intern.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/gc.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/hrtime.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/id.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/id_table.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/insns.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/insns_info.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/internal.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/iseq.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/known_errors.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/method.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/mjit.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/mjit_compile.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/node.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/node_name.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/opt_sc.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/optinsn.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/optunifs.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/parse.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/probes_helper.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/regenc.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/regint.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/regparse.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/revision.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ruby_assert.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/ruby_atomic.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/siphash.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/symbol.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/thread_pthread.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/thread_win32.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/timev.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/transcode_data.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/transient_heap.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/version.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_call_iseq_optimized.inc
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_core.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_debug.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_exec.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_insnhelper.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vm_opts.h
-- lib/debase/ruby_core_source/ruby-2.7.0-preview3/vmtc.inc
 - lib/debase/ruby_core_source/version.rb
-homepage: http://github.com/os97673/debase-ruby_core_source
+homepage: http://github.com/ruby-debug/debase-ruby_core_source
 licenses:
 - MIT
 metadata: {}
@@ -2410,7 +2319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provide Ruby core source files

data/lib/debase/ruby_core_source/ruby-2.7.0-preview2/addr2line.h

@@ -1,21 +0,0 @@
-/**********************************************************************
-
-  addr2line.h -
-
-  $Author$
-
-  Copyright (C) 2010 Shinichiro Hamaji
-
-**********************************************************************/
-
-#ifndef RUBY_ADDR2LINE_H
-#define RUBY_ADDR2LINE_H
-
-#if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H))
-
-void
-rb_dump_backtrace_with_lines(int num_traces, void **traces);
-
-#endif /* USE_ELF */
-
-#endif /* RUBY_ADDR2LINE_H */

data/lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/build_assert/build_assert.h

@@ -1,40 +0,0 @@
-/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
-#ifndef CCAN_BUILD_ASSERT_H
-#define CCAN_BUILD_ASSERT_H
-
-/**
- * BUILD_ASSERT - assert a build-time dependency.
- * @cond: the compile-time condition which must be true.
- *
- * Your compile will fail if the condition isn't true, or can't be evaluated
- * by the compiler.  This can only be used within a function.
- *
- * Example:
- *	#include <stddef.h>
- *	...
- *	static char *foo_to_char(struct foo *foo)
- *	{
- *		// This code needs string to be at start of foo.
- *		BUILD_ASSERT(offsetof(struct foo, string) == 0);
- *		return (char *)foo;
- *	}
- */
-#define BUILD_ASSERT(cond) \
-	do { (void) sizeof(char [1 - 2*!(cond)]); } while(0)
-
-/**
- * BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression.
- * @cond: the compile-time condition which must be true.
- *
- * Your compile will fail if the condition isn't true, or can't be evaluated
- * by the compiler.  This can be used in an expression: its value is "0".
- *
- * Example:
- *	#define foo_to_char(foo)					\
- *		 ((char *)(foo)						\
- *		  + BUILD_ASSERT_OR_ZERO(offsetof(struct foo, string) == 0))
- */
-#define BUILD_ASSERT_OR_ZERO(cond) \
-	(sizeof(char [1 - 2*!(cond)]) - 1)
-
-#endif /* CCAN_BUILD_ASSERT_H */

data/lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/check_type/check_type.h

@@ -1,63 +0,0 @@
-/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
-#ifndef CCAN_CHECK_TYPE_H
-#define CCAN_CHECK_TYPE_H
-
-/**
- * check_type - issue a warning or build failure if type is not correct.
- * @expr: the expression whose type we should check (not evaluated).
- * @type: the exact type we expect the expression to be.
- *
- * This macro is usually used within other macros to try to ensure that a macro
- * argument is of the expected type.  No type promotion of the expression is
- * done: an unsigned int is not the same as an int!
- *
- * check_type() always evaluates to 0.
- *
- * If your compiler does not support typeof, then the best we can do is fail
- * to compile if the sizes of the types are unequal (a less complete check).
- *
- * Example:
- *	// They should always pass a 64-bit value to _set_some_value!
- *	#define set_some_value(expr)			\
- *		_set_some_value((check_type((expr), uint64_t), (expr)))
- */
-
-/**
- * check_types_match - issue a warning or build failure if types are not same.
- * @expr1: the first expression (not evaluated).
- * @expr2: the second expression (not evaluated).
- *
- * This macro is usually used within other macros to try to ensure that
- * arguments are of identical types.  No type promotion of the expressions is
- * done: an unsigned int is not the same as an int!
- *
- * check_types_match() always evaluates to 0.
- *
- * If your compiler does not support typeof, then the best we can do is fail
- * to compile if the sizes of the types are unequal (a less complete check).
- *
- * Example:
- *	// Do subtraction to get to enclosing type, but make sure that
- *	// pointer is of correct type for that member.
- *	#define container_of(mbr_ptr, encl_type, mbr)			\
- *		(check_types_match((mbr_ptr), &((encl_type *)0)->mbr),	\
- *		 ((encl_type *)						\
- *		  ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr))))
- */
-#if HAVE_TYPEOF
-#define check_type(expr, type)			\
-	((typeof(expr) *)0 != (type *)0)
-
-#define check_types_match(expr1, expr2)		\
-	((typeof(expr1) *)0 != (typeof(expr2) *)0)
-#else
-#include "ccan/build_assert/build_assert.h"
-/* Without typeof, we can only test the sizes. */
-#define check_type(expr, type)					\
-	BUILD_ASSERT_OR_ZERO(sizeof(expr) == sizeof(type))
-
-#define check_types_match(expr1, expr2)				\
-	BUILD_ASSERT_OR_ZERO(sizeof(expr1) == sizeof(expr2))
-#endif /* HAVE_TYPEOF */
-
-#endif /* CCAN_CHECK_TYPE_H */

data/lib/debase/ruby_core_source/ruby-2.7.0-preview2/ccan/container_of/container_of.h

@@ -1,142 +0,0 @@
-/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
-#ifndef CCAN_CONTAINER_OF_H
-#define CCAN_CONTAINER_OF_H
-#include "ccan/check_type/check_type.h"
-
-/**
- * container_of - get pointer to enclosing structure
- * @member_ptr: pointer to the structure member
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info(struct foo *foo)
- *	{
- *		return container_of(foo, struct info, my_foo);
- *	}
- */
-#define container_of(member_ptr, containing_type, member)		\
-	 ((containing_type *)						\
-	  ((char *)(member_ptr)						\
-	   - container_off(containing_type, member))			\
-	  + check_types_match(*(member_ptr), ((containing_type *)0)->member))
-
-
-/**
- * container_of_or_null - get pointer to enclosing structure, or NULL
- * @member_ptr: pointer to the structure member
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type, unless it
- * is given NULL, in which case it also returns NULL.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info_allowing_null(struct foo *foo)
- *	{
- *		return container_of_or_null(foo, struct info, my_foo);
- *	}
- */
-static inline char *container_of_or_null_(void *member_ptr, size_t offset)
-{
-	return member_ptr ? (char *)member_ptr - offset : NULL;
-}
-#define container_of_or_null(member_ptr, containing_type, member)	\
-	((containing_type *)						\
-	 container_of_or_null_(member_ptr,				\
-			       container_off(containing_type, member))	\
-	 + check_types_match(*(member_ptr), ((containing_type *)0)->member))
-
-/**
- * container_off - get offset to enclosing structure
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does
- * typechecking and figures out the offset to the enclosing type.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info(struct foo *foo)
- *	{
- *		size_t off = container_off(struct info, my_foo);
- *		return (void *)((char *)foo - off);
- *	}
- */
-#define container_off(containing_type, member)	\
-	offsetof(containing_type, member)
-
-/**
- * container_of_var - get pointer to enclosing structure using a variable
- * @member_ptr: pointer to the structure member
- * @container_var: a pointer of same type as this member's container
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type.
- *
- * Example:
- *	static struct info *foo_to_i(struct foo *foo)
- *	{
- *		struct info *i = container_of_var(foo, i, my_foo);
- *		return i;
- *	}
- */
-#if HAVE_TYPEOF
-#define container_of_var(member_ptr, container_var, member) \
-	container_of(member_ptr, typeof(*container_var), member)
-#else
-#define container_of_var(member_ptr, container_var, member)	\
-	((void *)((char *)(member_ptr)	-			\
-		  container_off_var(container_var, member)))
-#endif
-
-/**
- * container_off_var - get offset of a field in enclosing structure
- * @container_var: a pointer to a container structure
- * @member: the name of a member within the structure.
- *
- * Given (any) pointer to a structure and a its member name, this
- * macro does pointer subtraction to return offset of member in a
- * structure memory layout.
- *
- */
-#if HAVE_TYPEOF
-#define container_off_var(var, member)		\
-	container_off(typeof(*var), member)
-#else
-#define container_off_var(var, member)			\
-	((const char *)&(var)->member - (const char *)(var))
-#endif
-
-#endif /* CCAN_CONTAINER_OF_H */