Commit ae11beb3 authored by Jacob Potter's avatar Jacob Potter

Refactors in preparation for Python

parent 7cf15a69
//
// Copyright 2015 Dropbox, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#pragma once
#ifdef _MSC_VER // weak attribute not supported by MSVC
#define DJINNI_WEAK_DEFINITION
#else
#define DJINNI_WEAK_DEFINITION __attribute__((weak))
#endif
......@@ -14,6 +14,7 @@
// limitations under the License.
//
#include "../djinni_common.hpp"
#include "djinni_support.hpp"
#include "../proxy_cache_impl.hpp"
#include <cassert>
......@@ -22,12 +23,6 @@
static_assert(sizeof(jlong) >= sizeof(void*), "must be able to fit a void* into a jlong");
#ifdef _MSC_VER // weak attribute not supported by MSVC
#define DJINNI_WEAK_DEFINITION
#else
#define DJINNI_WEAK_DEFINITION __attribute__((weak))
#endif
namespace djinni {
// Set only once from JNI_OnLoad before any other JNI calls, so no lock needed.
......
......@@ -4,7 +4,10 @@
"target_name": "djinni_jni",
"type": "static_library",
"sources": [
"djinni_common.hpp",
"jni/djinni_support.cpp",
"jni/djinni_support.hpp",
"jni/Marshal.hpp",
],
"include_dirs": [
"jni",
......
@import "set.djinni"
@import "derivings.djinni"
@import "nested_collection.djinni"
@import "map.djinni"
@import "primitive_list.djinni"
@import "exception.djinni"
@import "client_interface.djinni"
@import "enum.djinni"
@import "user_token.djinni"
@import "test.djinni"
@import "primtypes.djinni"
@import "constants.djinni"
@import "common.djinni"
@import "date.djinni"
@import "duration.djinni"
@import "set.djinni"
@import "derivings.djinni"
@import "nested_collection.djinni"
@import "map.djinni"
@import "primitive_list.djinni"
@import "exception.djinni"
@import "client_interface.djinni"
@import "enum.djinni"
@import "user_token.djinni"
@import "test.djinni"
@import "primtypes.djinni"
@import "constants.djinni"
djinni/all.djinni
djinni/common.djinni
djinni/set.djinni
djinni/derivings.djinni
djinni/nested_collection.djinni
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment