Merge lp:~jobinau/drizzle/mingwport into lp:~drizzle-trunk/drizzle/development

Proposed by Jobin Augustine
Status: Merged
Approved by: Monty Taylor
Approved revision: 1704
Merged at revision: 1713
Proposed branch: lp:~jobinau/drizzle/mingwport
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 12 lines (+2/-0)
1 file modified
drizzled/internal/my_sys.h (+2/-0)
To merge this branch: bzr merge lp:~jobinau/drizzle/mingwport
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Drizzle Merge Team Pending
Review via email: mp+32450@code.launchpad.net

Description of the change

First baby step towards windows port of drizzle client (command prompt).
this patch is to prevent build break.

To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

There are a couple of fixes that need to happen before this is merged, although I'm happy to see it working!

The #include "config.h" line needs to be removed from my_sys.h. We do not put that in headers - instead, it should be the first thing included by the .cc file. (Which should already be happening) If this is breaking, please let me know how and I'll help you find a solution.

Also, my_sys.h should really not be chmod +x - there is no need for it to be executable.

#ifdef HAVE_SYS_MMAN_H addition looks great though.

review: Needs Fixing
Revision history for this message
Jobin Augustine (jobinau) wrote :

Thanks Monty for this review.
I know, I need to fix these kind of stuffs to drizzle standard and thats why
trying to push small chunks.

On Sun, Aug 15, 2010 at 2:44 AM, Monty Taylor <email address hidden> wrote:

> Review: Needs Fixing
> There are a couple of fixes that need to happen before this is merged,
> although I'm happy to see it working!
>
> The #include "config.h" line needs to be removed from my_sys.h. We do not
> put that in headers - instead, it should be the first thing included by the
> .cc file. (Which should already be happening) If this is breaking, please
> let me know how and I'll help you find a solution.
>

I shall take a closer look, why it is required.
I think i may need a more guidance in this regard.

> Also, my_sys.h should really not be chmod +x - there is no need for it to
> be executable.

Oh my god. file copy from windows is messing up permissions. :). i will
correct.

> #ifdef HAVE_SYS_MMAN_H addition looks great though.
>

Thank you. but just wondering whether the definition of HAVE_SYS_MMAN_H
will come without "config.h"

--
> https://code.launchpad.net/~jobinau/drizzle/mingwport/+merge/32450<https://code.launchpad.net/%7Ejobinau/drizzle/mingwport/+merge/32450>
> You are the owner of lp:~jobinau/drizzle/mingwport.
>

Thank you,
Jobin.

Revision history for this message
Jobin Augustine (jobinau) wrote :

OK. a second thought put me in better understanding..my stupidity.
so the idea is we need to include config.h in .CC file before including <sys/mman.h>
i will modify accordingly and resubmit.

lp:~jobinau/drizzle/mingwport updated
1704. By jobin <jobin@jobin-laptop>

removed config.h
corrected the file permission

Revision history for this message
Jobin Augustine (jobinau) wrote :

Modified the file accordingly.
requesting your review and merge.

Revision history for this message
Monty Taylor (mordred) wrote :

Looks great! Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/internal/my_sys.h'
2--- drizzled/internal/my_sys.h 2010-06-01 21:54:27 +0000
3+++ drizzled/internal/my_sys.h 2010-08-15 07:28:44 +0000
4@@ -49,7 +49,9 @@
5
6 #include <drizzled/dynamic_array.h>
7
8+#ifdef HAVE_SYS_MMAN_H
9 #include <sys/mman.h>
10+#endif
11
12 #include "drizzled/qsort_cmp.h"
13