FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
990 Commits 1 Branch 31 Tags 2 MiB
2d2efde34a
Commit Graph

990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petri Lehtinen
2137e0c895 Add AppVeyor badge to README.rst 2014-09-25 07:51:55 +03:00
Petri Lehtinen
5fc44e10aa Merge pull request #205 from JoakimSoderberg/appveyor 
Added Windows CI support with appveyor
 2014-09-25 07:45:24 +03:00
Joakim Soderberg
b94d767f86 Added Windows CI support with appveyor 
Added support for http://www.appveyor.com/ (login via github account).

This will build the project and run the unit tests on Windows as well.
Possible to add a badge like with Travis in the README.md as well.
 2014-09-24 18:08:45 +02:00
Petri Lehtinen
43f17d010a Merge pull request #204 from bgoglin/master 
Don't use GNU-make specific export for global AM_CFLAGS
 2014-08-27 08:02:59 +03:00
Petri Lehtinen
fa20e80860 Parse subnormal numbers correctly 
Fixes #202.
 2014-08-27 07:59:52 +03:00
Brice Goglin
485c7640a1 Don't use GNU-make specific export for global AM_CFLAGS 
Just define it at configure time, it's automatically set in all makefiles.

Fixes #203.
 2014-08-26 15:01:13 +02:00
Petri Lehtinen
d4a7de7c11 Android.mk: Add -DHAVE_STDINT_H to LOCAL_CFLAGS 
See #200.
 2014-07-31 07:50:31 +03:00
Petri Lehtinen
a6229a2d3e doc: Enhance string overview 2014-07-21 08:15:34 +03:00
Petri Lehtinen
abd151f5d7 Merge pull request #198 from Smilex/mem_fix 
Fixed cases where file would be opened, but not closed.
 2014-07-21 08:09:18 +03:00
Ian T. Jacobsen
4f1238af71 Fix whitespace issues 2014-07-16 00:21:16 +01:00
Ian T. Jacobsen
122a1e2af9 Fixed cases where file would be opened, but not closed. And small realloc memory issue. 2014-07-16 00:16:32 +01:00
Petri Lehtinen
c8d017bd88 Merge branch '2.6' 2014-07-12 06:43:07 +03:00
Petri Lehtinen
23b1b7ba9a Document JANSSON_BUILD_SHARED_LIBS CMake option 
Fixes #187.
 2014-07-12 06:42:36 +03:00
Petri Lehtinen
88943b64e3 Define JSON_MAX_INDENT 
Fixes #191.
 2014-07-07 11:34:50 +03:00
Petri Lehtinen
348401e7b8 CMake: Use add_definitions for compiler flags 
Fixes #193.
 2014-07-02 22:04:34 +03:00
Petri Lehtinen
df248712a5 Include android config in tarballs 
Issue #166.
 2014-06-28 22:41:48 +03:00
Petri Lehtinen
de1b5db70e Fix autoreconf on Debian 
For some reason, Automake doesn't search the current directory correctly
when searching for helper scripts.

Fixes #182.
 2014-05-14 16:03:22 +03:00
Petri Lehtinen
4debe8e567 Add missing tests for JSON_REAL_PRECISION 2014-05-07 08:19:39 +03:00
Petri Lehtinen
28d362cf28 Merge pull request #180 from Sannis/master 
Enable usage of AddressSanitizer to check Jansson
 2014-05-05 14:45:09 +03:00
Oleg Efimov
541cdf5960 Remove unneeded undef 2014-05-05 15:40:41 +04:00
Oleg Efimov
fc6e314498 Enable usage of AddressSanitizer to check Jansson 2014-05-04 00:34:08 +04:00
Petri Lehtinen
17b5fdd94b Add JSON_REAL_PRECISION 
Fixes #178.
 2014-04-30 12:46:34 +03:00
Petri Lehtinen
5b88cc5ded Merge branch '2.6' 2014-04-30 12:06:03 +03:00
Petri Lehtinen
db285b3764 Check uint16_t and uint8_t support correctly 
Fixes #177.
 2014-04-30 12:05:51 +03:00
Petri Lehtinen
a425f8c650 Rename variables to work aroung a GCC bug on Solaris 
Fixes #175.
 2014-04-23 12:17:14 +03:00
Petri Lehtinen
96f8916e50 Merge pull request #174 from KimJeongYeon/master 
fix build error for android
 2014-04-14 08:32:47 +03:00
KimJeongYeon
dd2bf2971e fix build error for android 2014-04-11 23:14:34 +09:00
Petri Lehtinen
34a64cfe53 Merge pull request #171 from firepick1/master 
Solaris build fix
 2014-04-08 20:39:46 +03:00
Karl Lew
571617ebfc use __sun instead of sun 2014-04-08 15:57:58 +00:00
Karl Lew
3bd8a5729d Merge remote-tracking branch 'refs/remotes/origin/master' 2014-04-06 04:31:34 +00:00
Karl Lew
33e4988180 SmartOS build fix 2014-04-06 04:28:52 +00:00
firepick1
663fbfb7a4 SmartOS (Solaris) build 2014-04-04 17:28:08 -07:00
Petri Lehtinen
88aa6a9e30 Remove VS2010 project files, CMake should be used on Windows instead 
Fixes #165.
 2014-03-04 08:28:52 +02:00
Petri Lehtinen
92e2588d6e Merge branch '2.6' 2014-02-16 22:22:14 +02:00
Petri Lehtinen
960ead07f2 Merge pull request #164 from vincentbernat/fix/gitignore 
Add new autotools-generated files to .gitignore
 2014-02-16 22:20:25 +02:00
Petri Lehtinen
78da1de021 Merge pull request #163 from vincentbernat/fix/unpack-mix-optional-and-strict 
Fix unpack when mixing strict mode and optional keys
 2014-02-16 22:20:02 +02:00
Petri Lehtinen
946531bd7b Merge pull request #162 from nmlgc/master 
Three fixes for hashtable seeding on Windows
 2014-02-16 22:19:37 +02:00
Petri Lehtinen
10009d61a7 Merge pull request #164 from vincentbernat/fix/gitignore 
Add new autotools-generated files to .gitignore
 2014-02-16 22:10:16 +02:00
Petri Lehtinen
49fc6b1194 Merge pull request #163 from vincentbernat/fix/unpack-mix-optional-and-strict 
Fix unpack when mixing strict mode and optional keys
 2014-02-16 22:09:41 +02:00
Petri Lehtinen
6e8b2e161a Merge pull request #162 from nmlgc/master 
Three fixes for hashtable seeding on Windows
 2014-02-16 22:09:09 +02:00
Vincent Bernat
3922f84a2f Add new autotools-generated files to .gitignore 
Additionally, `/jansson_private_config.h.in` is also added as well as
"build" directory for those of us who like to use an out-of-tree build
system.
 2014-02-15 17:47:48 +01:00
Vincent Bernat
56a50e147d Micro-optimization for JSON_STRICT when no optional key is used 
The previous commit introduced a loop on all input keys to check the
strict mode. We can avoid this if we don't expect an optional key. In
this case, we fallback to the previous method to compare the length of
the set of expected keys and the length of the parsed keys.
 2014-02-15 17:44:02 +01:00
Vincent Bernat
7a0b9af662 Allow to mix JSON_STRICT with optional keys 
On unpack, one may want to mix `JSON_STRICT` and optional keys by using
a format like `{s:i,s?o!}`. Unfortunately, this fails the stric test
with `-1 object item(s) left unpacked` error when the second key is not
specified.

To fix that, we iter on each key and we check if we have successfully
unpacked them. This is less efficient than the previous method but it
brings correctness.
 2014-02-15 17:40:22 +01:00
nmlgc
4fbe44605b Three fixes for hashtable seeding on Windows 
First, wrap "advapi32.dll" into the TEXT() macro. If UNICODE is defined,
GetModuleHandle() redirects to GetModuleHandleW(), which excepts a wchar_t*
UTF-16 parameter, thus causing a compile error. TEXT() prefixes the string
literal with L in this case, and does nothing otherwise.

Second, make sure that CryptGenRandom() is actually called through the function
pointer retrieved by the call to GetProcAddress() above.

And third, replace _getpid() with the equivalent and more ubiquitous Win32 API
function GetCurrentProcessId(). Since _getpid() is not exported by all C
runtimes on Windows (most notably the Driver Development Kit), using it might
introduce previously unneeded runtime dependencies. GetCurrentProcessId(), on
the other hand, has been available in kernel32.dll since at least Windows 95,
just like the other API functions used in this code (GetModuleHandle() and
GetProcAddress()).
 2014-02-15 17:11:11 +01:00
Petri Lehtinen
ea7a77236c Merge branch '2.6' 2014-02-12 08:56:17 +02:00
Petri Lehtinen
1dc87ed5a1 Make valgrind happy 2014-02-12 08:54:26 +02:00
Petri Lehtinen
50a811ca07 Fix feature checks to use correct __ATOMIC flags 2014-02-12 08:54:26 +02:00
Petri Lehtinen
4bbb53a25d Make valgrind happy 2014-02-12 08:54:06 +02:00
Petri Lehtinen
569295fe30 Fix feature checks to use correct __ATOMIC flags 2014-02-12 08:44:29 +02:00
Petri Lehtinen
3f5acaa3fb Merge branch '2.6' 2014-02-11 15:15:00 +02:00