Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
Porting changes from master.
  • Loading branch information
coderarjob committed Dec 2, 2021
2 parents f71d89b + fceb463 commit a892003
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Release version: 2.0.1
* All header files are inside the headers folder.
* Binary for linux is built inside the bin/linux folder.

## Release version: 2.0.0
* **BUG FIX**: Linux incompatability resolved.
`typedef _int32 uint32_t` should be `typedef unsigend _int32 uint32_t`.
Expand Down
5 changes: 4 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/bin/sh

gcc -Wall -Wextra main.c tea.c -std=c99 -Wpedantic -o tea -I .
if [ ! -e bin/linux ]; then
mkdir -p bin/linux || exit
fi
gcc -Wall -Wextra main.c tea.c -std=c99 -Wpedantic -o bin/linux/tea
File renamed without changes.
4 changes: 2 additions & 2 deletions tea.h → headers/tea.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef __TEA__
#define __TEA__

#include "headers/stdint.h" // For standard int types
#include "headers/stdbool.h" // for bool, true, false
#include "stdint.h" // For standard int types
#include "stdbool.h" // for bool, true, false

// Cannot be changed, without impact to the code.
#define KEY_SIZE 16 // bytes
Expand Down
2 changes: 1 addition & 1 deletion main.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* ---------------------------------------------------------------------------
* */

#include "tea.h"
#include "headers/tea.h"
#include "headers/stdint.h" // For standard int types.
#include "headers/unistd.h" // For unlink
#include <stdio.h> // For printf and NULL, etc..
Expand Down
2 changes: 1 addition & 1 deletion tea.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Dated : 16th August 2020
* ---------------------------------------------------------------------------
* */
#include "tea.h"
#include "headers/tea.h"
#include "headers/unistd.h" // For read, write, access, close
#include "headers/fcntl.h" // For open
#include <stdio.h> // For printf and NULL, etc..
Expand Down

0 comments on commit a892003

Please sign in to comment.