Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -return-type warnings #781

Merged
merged 2 commits into from
May 2, 2024
Merged

Fix -return-type warnings #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b2dc9
a few fixes for warnings about return types
doste Apr 30, 2024
f7f76d9
Merge branch 'pharo-10' into fix-warning-return-type
guillep May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,16 +324,10 @@ add_compile_options(
-Wno-pointer-integer-compare
-Wno-unknown-pragmas
-Wno-pointer-sign
<<<<<<< HEAD
-Wno-constant-conversion
-Wno-tautological-pointer-compare
=======
>>>>>>> 66015f0470 (Re-enable warnings)
-Wno-deprecated-declarations
-Wno-pointer-to-int-cast
-Wno-compare-distinct-pointer-types
-Wno-conditional-type-mismatch
-Wno-return-type
-Wno-unused-local-typedef
-Wno-incompatible-pointer-types
-Wno-shift-negative-value
Expand Down
4 changes: 3 additions & 1 deletion extracted/plugins/FilePlugin/src/common/sqFilePluginBasicPrims.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ sqConnectToFile(SQFile *sqFile, void *file, sqInt writeFlag)
* 4 - stderr available
*/
sqInt
sqFileStdioHandlesInto(SQFile files[])
sqFileStdioHandlesInto(SQFile files[3])
{
/* streams connected to a terminal are supposed to be line-buffered anyway.
* And for some reason this has no effect on e.g. Mac OS X. So use
Expand Down Expand Up @@ -843,6 +843,8 @@ waitForDataonSemaphoreIndex(SQFile *file, sqInt semaphoreIndex){
aioEnable(fileno(getFile(file)), (void*) semaphoreIndex, AIO_EXT);
typedef void (*aioHandler)(int fd, void *clientData, int flag);
aioHandle(fileno(getFile(file)), signalOnDataArrival, AIO_R);

return interpreterProxy->success(true);
}

#endif /* NO_STD_FILE_SUPPORT */
2 changes: 1 addition & 1 deletion ffiTestLibrary/src/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EXPORT(int) reentringCallback(SIMPLE_CALLBACK fun, int base){
static int value = 0;

#if FEATURE_THREADED_FFI
void* otherThread(void* aFunction){
void otherThread(void* aFunction){
SIMPLE_CALLBACK f = (SIMPLE_CALLBACK) aFunction;

#ifdef _WIN32
Expand Down