]> Chaos Git - corbenik/ctrulib.git/commitdiff
Merge branch 'refactor' of github.com:smealum/ctrulib into refactor
authorsmea <smealum@gmail.com>
Wed, 27 Aug 2014 06:13:36 +0000 (23:13 -0700)
committersmea <smealum@gmail.com>
Wed, 27 Aug 2014 06:13:36 +0000 (23:13 -0700)
Conflicts:
libctru/include/3ds/types.h

1  2 
libctru/include/3ds/types.h

index 5a9924e027698c6e4d1890795484d1180abcc0e1,bfd565e3e85b12a826d5fae9faf54a38a8d9a86a..8ea81254dbfcb23c83ddec2fa0ebc30ad2c42597
@@@ -2,12 -2,10 +2,12 @@@
    types.h _ Various system types.
  */
  
- #ifndef TYPES_H
- #define TYPES_H
+ #pragma once
 +
 +#include <stdlib.h>
  #include <stdint.h>
  #include <stdbool.h>
+ #include <stddef.h>
  
  #define U64_MAX       UINT64_MAX